From 74a5ed96d6a84a2a57695e79b1dc4b7f6e9f7b9e Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 12 Jan 2007 18:20:16 +0000
Subject: [PATCH] Implement Issue 1049 proposal for testcase name standardization
---
opends/tests/functional-tests/testcases/schema/schema.xml | 135 ++++++++++++++++++++++-----------------------
1 files changed, 66 insertions(+), 69 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/schema/schema.xml b/opends/tests/functional-tests/testcases/schema/schema.xml
index 379004e..6fea117 100644
--- a/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -27,81 +27,78 @@
! -->
<stax>
- <defaultcall function="main_schema"/>
+ <defaultcall function="main_schema" />
<function name="main_schema">
- <sequence>
-
-<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>
-
+
+ <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/schema/schema_setup.xml' % (TESTS_DIR)" />
+ <call function="'schema_setup'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/schema/schema_rfc_tests.xml' % (TESTS_DIR)" />
+ <call function="'schema_rfc_tests'" />
+
+ <!--- 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>
+
</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/schema/schema_setup.xml' % (TESTS_DIR)"/>
- <call function="'schema_setup'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/schema/schema_rfc_tests.xml' % (TESTS_DIR)"/>
- <call function="'schema_rfc_tests'" />
-
- <!--- 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>
-
- </sequence>
-
</function>
</stax>
--
Gitblit v1.10.0