From a1c7cf8a7f806d69731f6ee3def830e022454882 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 15 Mar 2007 10:09:56 +0000
Subject: [PATCH] Issue 1365 remove parallel script for opends not starting in background
---
opends/tests/functional-tests/testcases/security/jks/security_jks.xml | 124 ++++++++++++++++------------------------
1 files changed, 50 insertions(+), 74 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/security/jks/security_jks.xml b/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
index 134f811..4aa6fe3 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -43,80 +43,56 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
- <call function="'setup_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
- <call function="'bob_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
- <call function="'teardown_jks'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!-- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!-- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!-- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
+ <call function="'setup_jks'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
+ <call function="'bob_jks'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_jks'" />
+
+ <!-- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
--
Gitblit v1.10.0