From b6f4914bb5b5d33a6565e61e9ce4da9b7d6fa1d4 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 21 Nov 2013 17:00:10 +0000
Subject: [PATCH] If a server fails to stop, kill it to avoid impact on other testcases

---
 opends/tests/staf-tests/shared/functions/utils.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index 92c2cf5..4879b04 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -783,7 +783,7 @@
 
     <sequence>
       <script>checkRC=9999</script>
-      <loop from="1" to="noOfLoops" var="loop" while="checkRC != 48">
+      <loop from="1" to="100" var="loop" while="checkRC != 48">
         <sequence>
           <message>
             'Check if %s/logs/server.pid still exists on host %s' \
@@ -818,6 +818,13 @@
             % (noOfLoops*noOfMilliSeconds,dsPath,location)
           </message>
           <tcstatus result="'fail'"/>
+          
+          <!-- Kill the server to avoid impact on the other testcases -->
+          <call function="'killDs'">
+            { 'location' : location,
+              'dsPath'   : dsPath
+            }
+          </call>
         </sequence>
       </if>
     </sequence>

--
Gitblit v1.10.0