From 559c0a050356b1d9e93b8e811f987ae5a3b0c406 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Tue, 29 May 2007 13:57:11 +0000
Subject: [PATCH] Reduced the number of setup/cleanup cycles to one for the aci modify filter functional tests.
---
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml | 14 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml | 20 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml | 14 ++
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml | 18 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml | 17 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml | 18 --
19 files changed, 49 insertions(+), 286 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
index 5e37b7f..d19e82c 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
@@ -37,6 +37,13 @@
<sequence>
+ <script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
+ CurrentTestPath['suite']=STAXCurrentBlock
+ </script>
+
+ <call function="'testSuite_Preamble'"/>
<!---
Place suite-specific test information here.
@@ -46,6 +53,9 @@
#@TestScript aci_modify_filter_test.xml
-->
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
+ <call function="'aci_setup'" />
<!---
Place test-specific test information here.
@@ -515,6 +525,10 @@
file="'%s/testcases/aci/aci_modify_filter_tests_aci26.xml' % (TESTS_DIR)"/>
<call function="'aci_modify_filter_tests_aci26'" />
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
+ <call function="'aci_cleanup'" />
+
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
index faa8503..d011891 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
@@ -44,12 +44,6 @@
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
<testcase name="'ACI: Modify Filter: ACI 1'">
<sequence>
@@ -273,13 +267,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
index b7e52df..904d603 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 11'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
index 237d74d..97c6538 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 12'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
index 033a109..88d0975 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 13'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
index 08d7602..37caf42 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 14'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
index c1e26e3..92f8723 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 15'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
index 9c1d260..7163e90 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 16'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
index 7c91eab..d1fc240 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 2'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
index b7f5e6b..a9805fb 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 21'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
index 981ade9..f375707 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 22'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
index 3cac5e9..e8dbdbc 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 23'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -268,18 +260,12 @@
{ 'returncode' : RC ,
'result' : STAXResult }
</call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
index 71628ed..2b68fe9 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 24'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
index 747eea5..4386cda 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 25'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
index 5c05647..5baa6b0 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 26'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
index 7ed0930..8f75832 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 3'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
index 03cbc13..c27cdcf 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 4'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
index 91bcfea..7491304 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
@@ -38,19 +38,10 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
<testcase name="'ACI: Modify Filter: ACI 5'">
<sequence>
@@ -274,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
index a8c792b..0231126 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
@@ -38,19 +38,11 @@
<sequence>
<script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
<call function="'testSuite_Preamble'"/>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
+
<testcase name="'ACI: Modify Filter: ACI 6'">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -273,13 +265,7 @@
</sequence>
</testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
--
Gitblit v1.10.0