From 59b3fd5c58827c95a3e3dda9436314dc4d10ccff Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 11 Jun 2008 08:59:40 +0000
Subject: [PATCH] Temporary fix to avoid remaning processes when some testcases fail in setup testsuite
---
opends/tests/functional-tests/testcases/setup/ports.xml | 21 ++++++++++
opends/tests/functional-tests/testcases/setup/security.xml | 42 +++++++++++++++++++++
2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/setup/ports.xml b/opends/tests/functional-tests/testcases/setup/ports.xml
index 5e4103b..b3f6c92 100644
--- a/opends/tests/functional-tests/testcases/setup/ports.xml
+++ b/opends/tests/functional-tests/testcases/setup/ports.xml
@@ -375,6 +375,27 @@
}
</call>
+ <!--- Temporary fix to avoid remaning processes
+ when this testcase fails -->
+ <script>
+ cmd = '%s/%s/%s/stop-ds%s' \
+ % (ODS_UNZIPPED, OPENDSNAME, fileFolder, fileExt)
+ </script>
+ <if expr="os.path.exists(cmd)" >
+ <sequence>
+ <message>'Stop instance'</message>
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsPath' : '%s/%s' % (ODS_UNZIPPED, OPENDSNAME),
+ 'dsPort' : 1,
+ 'dsBindDN' : 'cn=Directory Manager' ,
+ 'dsBindPwd' : 'kangourou' ,
+ 'expectedRC' : 'noCheck'
+ }
+ </call>
+ </sequence>
+ </if>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opends/tests/functional-tests/testcases/setup/security.xml b/opends/tests/functional-tests/testcases/setup/security.xml
index 86b0538..99bf26b 100644
--- a/opends/tests/functional-tests/testcases/setup/security.xml
+++ b/opends/tests/functional-tests/testcases/setup/security.xml
@@ -882,6 +882,27 @@
}
</call>
+ <!--- Temporary fix to avoid remaning processes
+ when this testcase fails -->
+ <script>
+ cmd = '%s/%s/%s/stop-ds%s' \
+ % (ODS_UNZIPPED, OPENDSNAME, fileFolder, fileExt)
+ </script>
+ <if expr="os.path.exists(cmd)" >
+ <sequence>
+ <message>'Stop I1'</message>
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsPath' : SEC_I1_ROOT,
+ 'dsPort' : SEC_I1_PORT,
+ 'dsBindDN' : DM_DN ,
+ 'dsBindPwd' : DM_PW ,
+ 'expectedRC' : 'noCheck'
+ }
+ </call>
+ </sequence>
+ </if>
+
<!-- 6.3. Uninstall I2 -->
<message>'++ Uninstall I2'</message>
<script>
@@ -906,6 +927,27 @@
}
</call>
+ <!--- Temporary fix to avoid remaning processes
+ when this testcase fails -->
+ <script>
+ cmd = '%s/%s/%s/stop-ds%s' \
+ % (ODS_UNZIPPED, OPENDSNAME, fileFolder, fileExt)
+ </script>
+ <if expr="os.path.exists(cmd)" >
+ <sequence>
+ <message>'Stop I2'</message>
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsPath' : SEC_I2_ROOT,
+ 'dsPort' : SEC_I2_PORT,
+ 'dsBindDN' : DM_DN ,
+ 'dsBindPwd' : DM_PW ,
+ 'expectedRC' : 'noCheck'
+ }
+ </call>
+ </sequence>
+ </if>
+
<call function="'testCase_Postamble'"/>
</sequence>
--
Gitblit v1.10.0