Cleaned up a couple of test cases based on a fix committed for Issue 1473.

mkeyes

20.29.2007 3baa4b71747457ac15bf307ea97c09429c48dcb8

Cleaned up a couple of test cases based on a fix committed for Issue 1473.

 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml

@@ -46,77 +46,10 @@
                                                                
   
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/global_acis.xml' % (TESTS_DIR)"/>
          <call function="'global_acis'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
          <call function="'aci_target'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targetattr.xml' % (TESTS_DIR)"/>
          <call function="'aci_targetattr'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targetfilter.xml' % (TESTS_DIR)"/>
          <call function="'aci_targetfilter'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targattrfilter.xml' % (TESTS_DIR)"/>
          <call function="'aci_targattrfilter'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_targetscope.xml' % (TESTS_DIR)"/>
          <call function="'aci_targetscope'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_delete_entry.xml' % (TESTS_DIR)"/>
          <call function="'aci_delete_entry'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_add_entry.xml' % (TESTS_DIR)"/>
          <call function="'aci_add_entry'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_entry.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_entry'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_filter_tests.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_filter_tests'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_compare_tests.xml' % (TESTS_DIR)"/>
          <call function="'aci_compare_tests'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/multiple_aci_tests.xml' % (TESTS_DIR)"/>
          <call function="'multiple_aci_tests'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_modify_rdn.xml' % (TESTS_DIR)"/>
          <call function="'aci_modify_rdn'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_rdn_wildcards.xml' % (TESTS_DIR)"/>
          <call function="'aci_rdn_wildcards'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_bindtypes.xml' % (TESTS_DIR)"/>
          <call function="'aci_bindtypes'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_proxy_auth.xml' % (TESTS_DIR)"/>
          <call function="'aci_proxy_auth'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_effective_rights.xml' % (TESTS_DIR)"/>
          <call function="'aci_effective_rights'" />
  
          <import machine="STAF_LOCAL_HOSTNAME"
            file="'%s/testcases/aci/aci_import.xml' % (TESTS_DIR)"/>
          <call function="'aci_import'" />
  
          
                                            
          <call function="'testGroup_Postamble'"/>
        

 opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targattrfilter.xml

@@ -1208,20 +1208,6 @@
                  }
                </call>

                <!-- The following operation can be removed when Issue 1473 is fixed. -->
                <!--
                <message>
                   'ACI: Targattrfilter: Targattrfilter with mispelled del with add, admin deleting 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_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
                </call>
                -->
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
@@ -1311,20 +1297,6 @@
                  }
                </call>

                <!-- The following operation can be removed when Issue 1473 is fixed. -->
                <!--
                <message>
                   'ACI: Targattrfilter: Targattrfilter with extra commas, admin deleting 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_targattrfilter/del_aci.ldif' % logsRemoteDataDir }
                </call>
                -->
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }