From 4f024fc2ba4b832fc537ed3fefbd96b307ecc519 Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Fri, 18 May 2007 10:53:37 +0000
Subject: [PATCH] Setting execution granularity at Suite level: Part 4
---
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_add_entry.xml | 16
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml | 16 +
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml | 20 +
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml | 17 +
opends/tests/functional-tests/testcases/aci/aci_target.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_setup.xml | 165 ++++++----
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_targattrfilter.xml | 17 +
opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml | 16 +
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml | 16 +
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_cleanup.xml | 94 ++++++
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_bindtypes.xml | 16 +
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_compare_tests.xml | 17 +
opends/tests/functional-tests/testcases/aci/global_acis.xml | 18 +
opends/tests/functional-tests/testcases/runTestJob.xml | 2
opends/tests/functional-tests/testcases/aci/aci.xml | 47 --
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml | 15
opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml | 18 +
opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml | 17 +
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 +
opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 16 +
opends/tests/functional-tests/testcases/aci/aci_teardown.xml | 20 +
opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml | 17 +
37 files changed, 701 insertions(+), 184 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci.xml b/opends/tests/functional-tests/testcases/aci/aci.xml
index 2c812cd..bd199f2 100755
--- a/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -42,32 +42,8 @@
</script>
<call function="'testGroup_Preamble'"/>
-
- <!--- Start DS -->
- <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>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
+
+
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/aci/global_acis.xml' % (TESTS_DIR)"/>
<call function="'global_acis'" />
@@ -128,24 +104,7 @@
file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
<call function="'aci_teardown'" />
- <!--- Stop DS -->
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <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>
-
+
<call function="'testGroup_Postamble'"/>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
index e439aba..619a844 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,12 @@
#@TestSuiteGroup ACI Add Entry Tests
#@TestScript aci_add_entry.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -2011,7 +2018,12 @@
</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_bindtypes.xml b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 3c9b22d..1f668fa 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,13 @@
#@TestSuiteGroup Basic ACI Bind Types Tests
#@TestScript aci_bindtypes.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -5132,6 +5140,12 @@
</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_cleanup.xml b/opends/tests/functional-tests/testcases/aci/aci_cleanup.xml
new file mode 100755
index 0000000..67d21b6
--- /dev/null
+++ b/opends/tests/functional-tests/testcases/aci/aci_cleanup.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE stax SYSTEM "stax.dtd">
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Portions Copyright 2007 Sun Microsystems, Inc.
+ ! -->
+<stax>
+
+ <defaultcall function="aci_cleanup"/>
+
+ <function name="aci_cleanup">
+
+ <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,
+ 'dsPort' : DIRECTORY_INSTANCE_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>
+
+
+ </sequence>
+ </block>
+
+ </sequence>
+
+ </function>
+
+</stax>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
index 1319c57..8b408ea 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,6 +52,13 @@
#@TestSuiteGroup ACI Compare Entry Tests
#@TestScript aci_compare_tests.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -1923,7 +1932,13 @@
</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_delete_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
index 1aa2fa5..d8ed5d4 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,12 @@
#@TestSuiteGroup ACI Delete Entry Tests
#@TestScript aci_delete_entry.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -2411,7 +2418,13 @@
</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_entry.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
index ff6cd7e..eeb6c2f 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_entry.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,12 @@
#@TestSuiteGroup ACI Modify Entry Tests
#@TestScript aci_modify_entry.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -3537,6 +3544,8 @@
</sequence>
</testcase>
+
+
<!---
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -3577,6 +3586,12 @@
</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.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml
index bb6fd71..5e37b7f 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,12 +37,7 @@
<sequence>
- <script>
- CurrentTestPath['group']='security'
- </script>
-
- <call function="'testGroup_Preamble'"/>
-
+
<!---
Place suite-specific test information here.
#@TestSuiteName ACI Modify Filter Tests
@@ -50,7 +45,8 @@
#@TestSuiteGroup ACI Modify Filter Tests
#@TestScript aci_modify_filter_test.xml
-->
-
+
+
<!---
Place test-specific test information here.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -518,9 +514,8 @@
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/testcases/aci/aci_modify_filter_tests_aci26.xml' % (TESTS_DIR)"/>
<call function="'aci_modify_filter_tests_aci26'" />
-
- <call function="'testGroup_Postamble'"/>
-
+
+
</sequence>
</block>
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 332db26..faa8503 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
@@ -38,10 +38,18 @@
<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 1'">
<sequence>
@@ -265,7 +273,13 @@
</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 904d603..b7e52df 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 97c6538..237d74d 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 88d0975..033a109 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 37caf42..08d7602 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 92f8723..c1e26e3 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 7163e90..9c1d260 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 d1fc240..7c91eab 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 a9805fb..b7f5e6b 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 f375707..981ade9 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 e8dbdbc..3cac5e9 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,11 +38,19 @@
<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'"/>
@@ -260,12 +268,18 @@
{ '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 2b68fe9..71628ed 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 4386cda..747eea5 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 5baa6b0..5c05647 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 8f75832..7ed0930 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 c27cdcf..03cbc13 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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 7491304..91bcfea 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,10 +38,19 @@
<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>
@@ -265,7 +274,13 @@
</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 0231126..a8c792b 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,11 +38,19 @@
<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'"/>
@@ -265,7 +273,13 @@
</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_rdn.xml b/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
index 4c16d4f..43a415a 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_modify_rdn.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,13 @@
#@TestSuiteGroup ACI Modify RDN Tests
#@TestScript aci_modify_rdn.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -2248,6 +2256,12 @@
</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_rdn_wildcards.xml b/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
index 0e1bb1b..dc9e65f 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,13 @@
#@TestSuiteGroup Basic ACI Target Tests
#@TestScript aci_target.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -2084,6 +2092,12 @@
</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_setup.xml b/opends/tests/functional-tests/testcases/aci/aci_setup.xml
index e4a0bca..bee1ade 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_setup.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_setup.xml
@@ -36,84 +36,109 @@
<block name="'setup'">
<sequence>
-
+
<script>
- CurrentTestPath['suite']=STAXCurrentBlock
+ CurrentTestPath['group']='aci'
</script>
+
+
+ <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>
- <call function="'testSuite_Preamble'"/>
-
- <!---
- Place group-specific test information here.
- #@TestGroupName ACI
- #@TestGroupPurpose To test the ACI functionality.
-
- Place suite-specific test information here.
- #@TestSuiteName ACI Setup Tests
- #@TestSuitePurpose Configure OpenDS to test ACI functionality.
- #@TestSuiteGroup ACI Setup Tests
- #@TestScript aci_setup.xml
- -->
+ </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>
+
+ </sequence>
+ <!--- End Block DS Process Active -->
+ </block>
+
+
+
+ <block name="'Block DS Load Data'">
+ <!-- Load the data needed by the test suite -->
+ <sequence>
+
+ <message>
+ 'ACI: ACI Setup: Adding Initial Entries'
+ </message>
- <!--- Test Case : Add Entries for ACI Tests -->
- <!---
- Place test-specific test information here.
- The tag, TestMarker, must be the same as the tag, TestSuiteName.
- #@TestMarker ACI Setup Tests
- #@TestName ACI Startup Test
- #@TestIssue none
- #@TestPurpose Add entries that are needed for the ACI tests.
- #@TestPreamble none
- #@TestStep Add entries with ldapmodify.
- #@TestPostamble none
- #@TestResult Success if OpenDS returns 0 for all operations
- -->
- <testcase name="'ACI: ACI Setup: Add Initial Entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'ACI: ACI Setup: Adding Initial Entries'
- </message>
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/aci/aci_startup.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/aci/aci_startup.ldif' % STAGED_DATA_DIR }
- </call>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
+ <message>
+ 'ACI: ACI Setup: Enabling ACI'
+ </message>
- <message>
- 'ACI: ACI Setup: Enabling ACI'
- </message>
+ <call function="'modifyEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_target/aci_handler.ldif' % STAGED_DATA_DIR }
+ </call>
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/aci_handler.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
-
- </block>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ </sequence>
+ <!--- End Block DS Load Data -->
+ </block>
+
+
+ </sequence>
+ </block>
</sequence>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index d1e4e08..3c04708 100644
--- a/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,12 @@
#@TestSuiteGroup Basic ACI Targattrfilter Tests
#@TestScript aci_targattrfilter.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -1803,7 +1810,13 @@
</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_target.xml b/opends/tests/functional-tests/testcases/aci/aci_target.xml
index 7819713..8aa3512 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_target.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,13 @@
#@TestSuiteGroup Basic ACI Target Tests
#@TestScript aci_target.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -2803,7 +2811,13 @@
</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_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 30aa92d..1fba883 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,12 @@
#@TestSuiteGroup Basic ACI Targetattr Tests allow(read)
#@TestScript aci_targetattr.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -1563,8 +1570,13 @@
</sequence>
</testcase>
-
- <call function="'testSuite_Postamble'"/>
+
+
+ <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_targetfilter.xml b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
index d707f51..76b3d63 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,12 @@
#@TestSuiteGroup Basic ACI Targetfilter Tests allow(read)
#@TestScript aci_targetfilter_syntax.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -3254,7 +3261,13 @@
</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_teardown.xml b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
index 9dc31a8..563c5ae 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -54,7 +56,13 @@
#@TestSuiteGroup ACI Teardown Tests
#@TestScript aci_teardown.xml
-->
-
+
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
+ <call function="'aci_setup'" />
+
+
<!--- Test Case : Remove Entries for ACI Tests -->
<!---
Place test-specific test information here.
@@ -110,8 +118,14 @@
</sequence>
</testcase>
-
- <call function="'testSuite_Postamble'"/>
+
+
+ <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/global_acis.xml b/opends/tests/functional-tests/testcases/aci/global_acis.xml
index d5e2589..d725c06 100755
--- a/opends/tests/functional-tests/testcases/aci/global_acis.xml
+++ b/opends/tests/functional-tests/testcases/aci/global_acis.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,7 +52,13 @@
#@TestSuiteGroup Global ACI Tests
#@TestScript global_acis.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -430,7 +438,13 @@
</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/multiple_aci_tests.xml b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index 812df1a..70399b0 100644
--- a/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opends/tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -38,6 +38,8 @@
<sequence>
<script>
+ if not CurrentTestPath.has_key('group'):
+ CurrentTestPath['group']='aci'
CurrentTestPath['suite']=STAXCurrentBlock
</script>
@@ -50,6 +52,13 @@
#@TestSuiteGroup Multiple ACi Tests
#@TestScript multiple_aci_tests.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.
The tag, TestMarker, must be the same as the tag, TestSuiteName.
@@ -4412,7 +4421,12 @@
</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/runTestJob.xml b/opends/tests/functional-tests/testcases/runTestJob.xml
index 8ec624c..940a49b 100644
--- a/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -41,7 +41,7 @@
<job name="'Job: %s %s' % (STAF_REMOTE_HOSTNAME,TEST_OS_STRING) " monitor="1" clearlogs="'Enabled'" logtcstartstop="'Enabled'">
<job-file>'%s/testcases/runFuncTests.xml' % TESTS_DIR</job-file>
- <job-scriptfiles machine="'%s' % STAF_LOCAL_HOSTNAME">['%s/config/config.py' % TESTS_DIR,'%s/python/security.py' % TESTS_SHARED_DIR,'%s/python/synchronization.py' % TESTS_SHARED_DIR ]</job-scriptfiles>
+ <job-scriptfiles machine="'%s' % STAF_LOCAL_HOSTNAME">['%s/config/config.py' % TESTS_DIR ]</job-scriptfiles>
<job-action>
<log>'Started sub-job %s on %s' % (STAXSubJobID,STAF_REMOTE_HOSTNAME)</log>
</job-action>
--
Gitblit v1.10.0