From cddf7c47847bd8c2ef0d00700b616abcae431de0 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 23 Feb 2007 10:28:22 +0000
Subject: [PATCH] Issue 1076 store test logs per testcase
---
opends/tests/functional-tests/testcases/security/jks/security_jks.xml | 150 +++++++++++++++++++++++++------------------------
1 files changed, 77 insertions(+), 73 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 552e74d..b809964 100755
--- a/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
+++ b/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -31,84 +31,88 @@
<function name="security_jks">
- <sequence>
+ <sequence>
+
+ <script>
+ CurrentTestPath['suite']='jks'
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
+
+ <parallel>
- <call function="'testSuite_Preamble'"/>
+ <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="'startDS'">
+ { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
+ </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="'stopDS'">
+ { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+
+ </sequence>
+
+ <!--- End Block Clients -->
+ </block>
-<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="'startDS'">
- { 'dsbinpath' : '%s' % (OPENDS_BINPATH) }
- </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="'stopDS'">
- { 'dsInstancePort' : '%s' % (DIRECTORY_INSTANCE_PORT) }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <return>RC</return>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
-</parallel>
+ </parallel>
<call function="'testSuite_Postamble'"/>
- </sequence>
+ </sequence>
</function>
--
Gitblit v1.10.0