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/setup.xml | 116 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 66 insertions(+), 50 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
index 09a6cbd..e4d005f 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
@@ -32,56 +32,72 @@
<sequence>
<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>
-
- <!--- 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>
-
- <call function="'ldapSearchWithScript'">
- { 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'dc=com' ,
- 'dsFilter' : 'objectclass=*' }
- </call>
-
- </sequence>
- <!--- End Block DS Process Active -->
- </block>
+
+ <script>
+ CurrentTestPath['suite']='setup_tasks'
+ </script>
+ <call function="'testSuite_Preamble'" />
+
+ <testcase name="getTestCaseName('Setup tasks')">
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <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>
+
+ <!--- 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>
+
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : 'dc=com' ,
+ 'dsFilter' : 'objectclass=*' }
+ </call>
+
+ </sequence>
+ <!--- End Block DS Process Active -->
+
+ </block>
+
+ <call function="'testSuite_Postamble'"/>
+ </sequence>
+ </testcase>
</sequence>
</block>
</sequence>
--
Gitblit v1.10.0