Issue 1784 data and temporary files must go into a unique folder

gary_williams

13.56.2007 504f0f7a278410099e966d7689c07b106f88cb06

 opends/tests/functional-tests/testcases/aci/aci_targetscope.xml

@@ -88,7 +88,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % STAGED_DATA_DIR }
                    'entryToBeModified'   : '%s/aci/aci_rm_global_search.ldif' % logsRemoteDataDir }
                </call>
    
                <if expr="RC != 0">
@@ -104,7 +104,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeAdded'   : '%s/aci/aci_targetscope/aci_startup_targetscope.ldif' % STAGED_DATA_DIR }
                    'entryToBeAdded'   : '%s/aci/aci_targetscope/aci_startup_targetscope.ldif' % logsRemoteDataDir }
                </call>
    
                <call function="'checktestRC'">
@@ -141,7 +141,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_aci1.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -153,7 +153,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
@@ -289,7 +289,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % STAGED_DATA_DIR }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
                </call>
    
                <if expr="RC != 0">
@@ -349,7 +349,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_aci2.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -361,7 +361,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
@@ -506,7 +506,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % STAGED_DATA_DIR }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
                </call>
    
                <if expr="RC != 0">
@@ -566,7 +566,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_aci3.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -578,7 +578,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
@@ -732,7 +732,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % STAGED_DATA_DIR }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
                </call>
    
                <if expr="RC != 0">
@@ -792,7 +792,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_aci4.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -804,7 +804,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                <if expr="RC != 0">
@@ -958,7 +958,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % STAGED_DATA_DIR }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/del_aci.ldif' % logsRemoteDataDir }
                </call>
    
                <if expr="RC != 0">
@@ -1012,7 +1012,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_syntax_aci1.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -1024,7 +1024,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                 <call function="'checktestRC'">
@@ -1056,7 +1056,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_syntax_aci2.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -1068,7 +1068,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                 <call function="'checktestRC'">
@@ -1100,7 +1100,7 @@
                          
                <script>
                    curr_aci_ldif_file = 'add_syntax_aci3.ldif'
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
                    curr_aci=retrieve_aci('%s/aci/aci_targetscope/%s' % (logsLocalDataDir,curr_aci_ldif_file));
                </script>
        
                <message>
@@ -1112,7 +1112,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
                    'entryToBeModified'   : '%s/aci/aci_targetscope/%s' % (logsRemoteDataDir,curr_aci_ldif_file) }
                </call>
    
                 <call function="'checktestRC'">
@@ -1171,7 +1171,7 @@
                    'dsInstancePort'   : DIRECTORY_INSTANCE_PORT ,
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % STAGED_DATA_DIR }
                    'entryToBeModified'   : '%s/aci/aci_reset_global_search.ldif' % logsRemoteDataDir }
                </call>
    
                <call function="'checktestRC'">