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/schema/schema_setup.xml |   74 +++++++++++++++++++-----------------
 1 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index a4979b9..efcd007 100644
--- a/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -31,43 +31,47 @@
 
   <function name="schema_setup">
 
-      <sequence>
+    <sequence>
+
+      <script>
+        CurrentTestPath['suite']='setup'
+      </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'"/>
+          <message>
+             'Add entries that are required for the Schema Tests'
+          </message>
+
+          <call function="'addEntry'">
+            { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
+              'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
+              'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
+              'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
+              'entryToBeAdded'   : '%s/schema/ldifs/schema_start.ldif' % STAGED_DATA_DIR }
+          </call>
+
+          <call function="'checktestRC'">
+              { 'returncode' : RC ,
+                'result'     : STAXResult }
+          </call>
+          <call function="'testCase_Postamble'"/>
+        </sequence>
+      </testcase>
       
-        <call function="'testSuite_Preamble'"/>
+      <call function="'testSuite_Postamble'"/>
 
-        <!--- 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'"/>
-            <message>
-               'Add entries that are required for the Schema Tests'
-            </message>
-
-            <call function="'addEntry'">
-              { 'dsInstanceHost'   : DIRECTORY_INSTANCE_HOST ,
-                'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
-                'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
-                'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
-                'entryToBeAdded'   : '%s/schema/ldifs/schema_start.ldif' % STAGED_DATA_DIR }
-            </call>
-
-            <call function="'checktestRC'">
-                { 'returncode' : RC ,
-                  'result'     : STAXResult }
-            </call>
-            <call function="'testCase_Postamble'"/>
-          </sequence>
-        </testcase>
-        
-        <call function="'testSuite_Postamble'"/>
-
-     </sequence>
+    </sequence>
 
   </function>
 

--
Gitblit v1.10.0