From b643c10a26a80d6270e53229ff61cc730e5a748e Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Fri, 18 May 2007 10:47:47 +0000
Subject: [PATCH] Setting execution granularity at Suite level: Part 2
---
opends/tests/functional-tests/testcases/schema/schema_setup.xml | 93 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 27 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index fca9986..d481d72 100644
--- a/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Portions Copyright 2006-2007 Sun Microsystems, Inc.
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
! -->
<stax>
@@ -36,23 +36,63 @@
<block name="'setup'">
<sequence>
+
+
+ <block name="'Block Create DS Topology'">
+ <!-- Create the topology necessary to the test group/suite -->
+ <sequence>
+
+ <message>
+ 'Create DS topology as described in config.py'
+ </message>
+
+ <call function="'createTopology'">
+ { 'initialiseInstance' : True }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+ <!--- End Block Create DS Topology -->
+ </block>
+
+
+ <block name="'Block DS Process Active'">
+ <!--- Start DS -->
+ <sequence>
+
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
- <script>
- CurrentTestPath['suite']=STAXCurrentBlock
- </script>
-
- <call function="'testSuite_Preamble'"/>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <!--- Test Case : Add required entries -->
- <testcase name="'Core: Schema: Add required entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
+ <!--- 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>
+
+ </sequence>
+ <!--- End Block DS Process Active -->
+ </block>
+
+
+ <block name="'Block DS Load Data'">
+ <!-- Load the data needed by the test suite -->
+ <sequence>
+
<message>
'Add entries that are required for the Schema Tests'
</message>
@@ -65,21 +105,20 @@
'entryToBeAdded' : '%s/schema/ldifs/schema_start.ldif' % STAGED_DATA_DIR }
</call>
- <call function="'checktestRC'">
+ <call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
- <call function="'testCase_Postamble'"/>
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
- </sequence>
-
+
+ </sequence>
+ <!-- End Block DS Load Data -->
+ </block>
+
+ </sequence>
</block>
-
- </sequence>
+
+ </sequence>
</function>
--
Gitblit v1.10.0