From 694f29b025f9f4adc657ceba572b3188c5500787 Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Fri, 18 May 2007 10:49:53 +0000
Subject: [PATCH] Setting execution granularity at Suite level: Part 3
---
opends/tests/functional-tests/testcases/backends/import-tasks.xml | 55 +++++++++++++++----------------------------------------
1 files changed, 15 insertions(+), 40 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 1000f48..9d1af78 100644
--- a/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -39,30 +39,12 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='backends'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
- <!--- Start DS -->
- <message>
- 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
- </message>
-
- <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>
<!--- Test Suite information
#@TestSuiteName Backend Import Tasks Tests
@@ -73,7 +55,13 @@
#@TestScript import-tasks.xml
#@TestHTMLLink http://opends.dev.java.net/
-->
-
+
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/backend_setup.xml' % (TESTS_DIR)"/>
+ <call function="'backend_setup'" />
+
+
<!--- Test Case information
#@TestMarker Backend Import Tasks Tests
#@TestName Import Tasks: LDIF Default
@@ -1357,25 +1345,12 @@
<!-- Need to know what the error codes are -->
- <!--- Stop DS -->
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Stop DS -->
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/backends/backend_cleanup.xml' % (TESTS_DIR)"/>
+ <call function="'backend_cleanup'" />
+
+
<call function="'testSuite_Postamble'"/>
</sequence>
--
Gitblit v1.10.0