external-software/github_OpenIdentityPlatform_OpenDJ.git

parent: 9ba239d1 | patch | commit | ignore whitespace

Reduced the number of setup/cleanup cycles to one for the aci modify filter...

mkeyes

29.57.2007 559c0a050356b1d9e93b8e811f987ae5a3b0c406

Reduced the number of setup/cleanup cycles to one for the aci modify filter functional tests.

19 files modified

	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests.xml	14 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml	14 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml	20 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml	18 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml	17 ●●●●● patch \| view \| raw \| blame \| history
	opends/tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml	18 ●●●●● patch \| view \| raw \| blame \| history

 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>
      

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

 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>

			@@ -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>

			@@ -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>

			@@ -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>

			@@ -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>