From 4cdb29a91e6cb2c6820d8474fd2fdcb6b1f69da8 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 09 Dec 2008 08:39:18 +0000
Subject: [PATCH] fix tasks test suite, add verification to schema tests
---
opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml | 85 +++++++++++++++++++++++++-----------------
1 files changed, 50 insertions(+), 35 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
index 896c148..6e41f25 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/cleanup.xml
@@ -32,41 +32,56 @@
<sequence>
<block name="'cleanup'">
<sequence>
- <block name="'Block DS Process Stop'">
- <!--- 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,
- 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- <!--- End Block DS Process Stop -->
- </block>
- <block name="'Block Remove DS Topology'">
- <!-- Remove the topology created for the test suite -->
- <sequence>
- <message>
- 'Remove DS topology created for the Test Suite'
- </message>
- <call function="'removeTopology'"/>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- <!-- End Block Remove DS Topology-->
- </block>
+
+ <script>
+ CurrentTestPath['suite']='cleanup_tasks'
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+ <testcase name="getTestCaseName('Cleanup tasks')">
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <block name="'Block DS Process Stop'">
+ <!--- 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,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+ <!--- End Block DS Process Stop -->
+ </block>
+ <block name="'Block Remove DS Topology'">
+ <!-- Remove the topology created for the test suite -->
+ <sequence>
+ <message>
+ 'Remove DS topology created for the Test Suite'
+ </message>
+ <call function="'removeTopology'"/>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+ <!-- End Block Remove DS Topology-->
+ </block>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+ <call function="'testSuite_Postamble'"/>
</sequence>
</block>
</sequence>
--
Gitblit v1.10.0