From b4ff247aa88b1b821008505749a54ce24f4da069 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Mon, 23 Oct 2006 10:22:16 +0000
Subject: [PATCH] functional tests - implement data file staging
---
opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml | 10
opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml | 8
opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml | 33 ++--
opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml | 18 --
opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml | 95 ++++++++----
opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml | 4
opendj-sdk/opends/tests/functional-tests/config/config.py | 16 +-
opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml | 131 ++++++++++++++++--
opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml | 8
opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml | 54 +++---
opendj-sdk/opends/tests/functional-tests/shared/python/security.py | 2
15 files changed, 260 insertions(+), 147 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/config/config.py b/opendj-sdk/opends/tests/functional-tests/config/config.py
index 236a763..1081100 100644
--- a/opendj-sdk/opends/tests/functional-tests/config/config.py
+++ b/opendj-sdk/opends/tests/functional-tests/config/config.py
@@ -1,24 +1,24 @@
STAF_LOCAL_HOSTNAME = 'localhost'
STAF_REMOTE_HOSTNAME = 'localhost'
STAF_HOME_DIR = '/usr/local/staf'
-STAX_HOME_DIR = '/export/services/stax'
TMPDIR = '/tmp'
PSWDFILE = '/tmp/password'
-OPENDSDIR = '/export/mikek'
+OPENDSDIR = '/home/username/trunk/opends'
OPENDSNAME = 'OpenDS-0.1'
ZIPNAME = '%s.zip' % OPENDSNAME
-ZIPPATH = '/export/mikek/zip'
-TESTS_DIR = '%s/functional-tests' % OPENDSDIR
-TESTS_ROOT = '%s/functional-tests' % OPENDSDIR
+ZIPPATH = '%s/build/package' % OPENDSDIR
+TESTS_DIR = '%s/tests/functional-tests' % OPENDSDIR
+TESTS_ROOT = '%s/tests' % OPENDSDIR
TESTS_SHARED_DIR = '%s/shared' % TESTS_DIR
TESTS_FUNCTIONS_DIR = '%s/functions' % TESTS_SHARED_DIR
TESTS_DATA_DIR = '%s/data' % TESTS_SHARED_DIR
+TMP_DATA_DIR = '%s/functional-tests' % TMPDIR
DIRECTORY_INSTANCE_DN = 'cn=Directory Manager'
DIRECTORY_INSTANCE_PSWD = 'password'
-DIRECTORY_INSTANCE_DIR = '/export/mikek'
+DIRECTORY_INSTANCE_DIR = '/tmp'
DIRECTORY_INSTANCE_HOST = 'localhost'
DIRECTORY_INSTANCE_PORT = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX = 'dc=com'
-LDIF_DATA_DIR = '%s/data' % TESTS_SHARED_DIR
-JAVA_HOME = '/usr/jdk/jdk1.5.0_06'
+STAGED_DATA_DIR = '%s/functional-tests/shared/data' % DIRECTORY_INSTANCE_DIR
+JAVA_HOME = '/usr/jdk/jdk1.5.0_01'
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
index c624a66..278ccbd 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/security.xml
@@ -67,7 +67,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -85,7 +85,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/setup/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/setup/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -103,7 +103,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -111,9 +111,6 @@
'result' : STAXResult }
</call>
- <!--- Modify the SSL port to the user-defined value -->
- <script>write_ldaps_ldif_file('%s' % (TMPDIR), '%s' % (DIRECTORY_INSTANCE_SSL_PORT));</script>
-
<!--- Add LDAPS Connection Handler -->
<message>
'Adding LDAPS Connection Handler'
@@ -175,7 +172,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/setup/enable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -193,7 +190,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/setup/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/setup/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -211,7 +208,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/setup/enable_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -229,7 +226,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/setup/enable_startTLS.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/setup/enable_startTLS.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -280,7 +277,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/teardown/disable_ldaps_conn_handler.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/teardown/disable_ldaps_conn_handler.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -298,7 +295,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -316,7 +313,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -334,7 +331,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -385,7 +382,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/teardown/disable_startTLS.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/teardown/disable_startTLS.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -403,7 +400,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/teardown/deleteTrustMgr.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -421,7 +418,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeAdded' : '%s/security/%s/teardown/default_trust_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
@@ -439,7 +436,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (LDIF_DATA_DIR,keystoreType) }
+ 'entryToBeModified' : '%s/security/%s/teardown/disable_key_mgr_provider.ldif' % (STAGED_DATA_DIR,keystoreType) }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml
index 8569b39..1977696 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/stafcmd.xml
@@ -31,7 +31,7 @@
<function name="copyfile">
<function-prolog>
- This function copies a source file to destination file to a remote host
+ This function copies a source file to destination file to host
</function-prolog>
<function-map-args>
@@ -49,9 +49,9 @@
<function-arg-property name="type" value="filename"/>
</function-arg-def>
- <function-arg-def name="remotehost" type="optional" default="local">
+ <function-arg-def name="remotehost" type="optional" default="localhost">
<function-arg-description>
- The name of remote host (default local)
+ The name of remote host (default localhost)
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
@@ -60,17 +60,85 @@
<sequence>
- <stafcmd name="'STAF Command: Copy Zip File'">
+ <stafcmd name="'STAF Command: Copy File'">
<location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
<service>'fs'</service>
<request>'COPY FILE %s TOFILE %s TOMACHINE %s' % (srcfile,destfile,remotehost) </request>
</stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAFResult }
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
</call>
+ <return>cmdRC</return>
+
+ </sequence>
+
+ </function>
+
+ <function name="CopyFolderByExtension">
+
+ <function-prolog>
+ Copies files by extension from a source to destination folder on host
+ </function-prolog>
+
+ <function-map-args>
+ <function-arg-def name="srcfolder" type="required">
+ <function-arg-description>
+ The name of the source folder
+ </function-arg-description>
+ <function-arg-property name="type" value="foldername"/>
+ </function-arg-def>
+
+ <function-arg-def name="destfolder" type="required">
+ <function-arg-description>
+ The name of the destination fule
+ </function-arg-description>
+ <function-arg-property name="type" value="foldername"/>
+ </function-arg-def>
+
+ <function-arg-def name="extension" type="optional" default="'txt'">
+ <function-arg-description>
+ The name of host (default txt)
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ <function-arg-def name="hostname" type="optional" default="'localhost'">
+ <function-arg-description>
+ The name of remote host (default localhost)
+ </function-arg-description>
+ <function-arg-property name="type" value="hostname"/>
+ </function-arg-def>
+
+ </function-map-args>
+
+ <sequence>
+
+ <stafcmd name="'STAF Command: Copy all %s Files.' % (extension)">
+ <location>'%s' % (STAF_LOCAL_HOSTNAME)</location>
+ <service>'fs'</service>
+ <request>'COPY DIRECTORY %s TODIRECTORY %s TOMACHINE %s EXT %s RECURSE' % (srcfolder,destfolder,hostname,extension) </request>
+ </stafcmd>
+
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
+ <call function="'checkRC'">
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
+ </call>
+
+ <return>cmdRC</return>
+
</sequence>
</function>
@@ -103,11 +171,18 @@
</request>
</stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAFResult }
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
</call>
+ <return>cmdRC</return>
+
</sequence>
</function>
@@ -125,8 +200,8 @@
<function-required-arg name="unzipdir">
name of destination folder to place zip file contents
</function-required-arg>
- <function-optional-arg name="ziphost" default="'local'">
- name of host on which to unzip (default local)
+ <function-optional-arg name="ziphost" default="'localhost'">
+ name of host on which to unzip (default localhost)
</function-optional-arg>
</function-map-args>
@@ -141,11 +216,18 @@
</request>
</stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAFResult }
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
</call>
+ <return>cmdRC</return>
+
</sequence>
</function>
@@ -199,11 +281,18 @@
</request>
</stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAFResult }
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
</call>
+ <return>cmdRC</return>
+
</sequence>
</function>
@@ -225,7 +314,7 @@
<sequence>
- <stafcmd name="'STAF Command: Recursively Delete Existing Folder'">
+ <stafcmd name="'STAF Command: Recursively Delete Folder'">
<location>'%s' % (hostname)</location>
<service>'fs'</service>
<request>
@@ -233,10 +322,18 @@
</request>
</stafcmd>
+ <script>
+ cmdRC=RC
+ cmdResult=STAFResult
+ </script>
+
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAFResult }
+ { 'returncode' : cmdRC ,
+ 'result' : cmdResult }
</call>
+
+ <return>cmdRC</return>
+
</sequence>
</function>
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/python/security.py b/opendj-sdk/opends/tests/functional-tests/shared/python/security.py
index 1b0dbc4..3bd10e4 100644
--- a/opendj-sdk/opends/tests/functional-tests/shared/python/security.py
+++ b/opendj-sdk/opends/tests/functional-tests/shared/python/security.py
@@ -1,4 +1,4 @@
-#! /usr/bin python
+#!/usr/bin/python
def write_ldaps_ldif_file(path, port):
ldif_file = open(path + "/ldaps_port.ldif","w")
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
index ccd86aa..b27f8b0 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import.xml
@@ -62,7 +62,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % LDIF_DATA_DIR }
+ { 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -101,7 +101,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
'backEnd' : 'nonDefault' }
</call>
@@ -139,7 +139,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-b dc=com'
}
</call>
@@ -179,7 +179,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-b "dc=com" -b "dc=example,dc=com"'
}
</call>
@@ -219,7 +219,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-B "ou=Departed,ou=People,dc=example,dc=com"'
}
</call>
@@ -262,7 +262,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-B "ou=Departed,ou=People,dc=example,dc=com"'
}
</call>
@@ -305,7 +305,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-b dc=com -B "ou=Departed,ou=People,dc=example,dc=com"'
}
</call>
@@ -348,7 +348,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-i dc'
}
</call>
@@ -388,7 +388,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-i dc -i cn -i ou -i sn'
}
</call>
@@ -429,7 +429,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-e userpassword'
}
</call>
@@ -469,7 +469,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-e userpassword -e mail -e roomnumber'
}
</call>
@@ -509,7 +509,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
'extraParams' : '-i dc -i cn -i ou -i sn -b "dc=com" -b "dc=example,dc=com" -b "ou=People,dc=example,dc=com" -B "ou=Departed,ou=People,dc=example,dc=com"'
}
</call>
@@ -552,7 +552,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-I "objectclass=*'
}
</call>
@@ -593,7 +593,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-E "objectclass=person"'
}
</call>
@@ -636,7 +636,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-I "objectclass=domain" -I "objectclass=organizationalunit"'
}
</call>
@@ -679,7 +679,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-E "objectclass=person" -E "objectclass=organizationalunit"'
}
</call>
@@ -719,7 +719,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Include.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
'extraParams' : '-I "|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)"'
}
</call>
@@ -760,7 +760,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-E "&(objectclass=person)(ou=Departed)"'
}
</call>
@@ -800,7 +800,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Exclude.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
'extraParams' : '-E "&(objectclass=person)(ou=Departed)" -b "dc=com" -e userpassword'
}
</call>
@@ -840,7 +840,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Append.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
'extraParams' : '-a'
}
</call>
@@ -881,7 +881,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Append.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
'extraParams' : '-a -r'
}
</call>
@@ -922,7 +922,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif.gz' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Example.ldif.gz' % STAGED_DATA_DIR,
'extraParams' : '-c'
}
</call>
@@ -963,7 +963,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
'extraParams' : '-y'
}
</call>
@@ -1023,7 +1023,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
'extraParams' : '-R %s/rejects.txt' % TMPDIR
}
</call>
@@ -1064,7 +1064,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Example.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
'extraParams' : '-R %s/rejects.txt -O' % TMPDIR
}
</call>
@@ -1105,7 +1105,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Schema.ldif' % LDIF_DATA_DIR,
+ { 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR,
'extraParams' : '-s'
}
</call>
@@ -1146,7 +1146,7 @@
<call function="'testCaseStartBanner'"/>
<call function="'importLdif'">
- { 'ldifFile' : '%s/backends/Schema.ldif' % LDIF_DATA_DIR }
+ { 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
index 7a6ddd7..8d938cf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/cleanup/cleanup.xml
@@ -34,31 +34,21 @@
<sequence>
- <!--- Prepare data files for transportation-->
+ <!--- Delete file if it exists already-->
<message>
'Delete folder %s/ldifdata.zip' % (DIRECTORY_INSTANCE_DIR)
- 'Delete existing zip archive if it exists already.'
</message>
<call function="'deletefile'">
- { 'filename' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR ,
- 'hostname' : STAF_LOCAL_HOSTNAME }
- </call>
-
- <!--- Delete folder if it exists already-->
- <message>
- 'Delete folder %s/shared' % (DIRECTORY_INSTANCE_DIR)
- </message>
- <call function="'deletefolder'">
- { 'foldername' : '%s/shared' % (DIRECTORY_INSTANCE_DIR),
+ { 'filename' : '%s/ldifdata.zip' % (DIRECTORY_INSTANCE_DIR),
'hostname' : STAF_REMOTE_HOSTNAME }
</call>
<!--- Delete folder if it exists already-->
<message>
- 'Delete folder %s/testcases' % (DIRECTORY_INSTANCE_DIR)
+ 'Delete folder %s/functional-tests' % (DIRECTORY_INSTANCE_DIR)
</message>
<call function="'deletefolder'">
- { 'foldername' : '%s/testcases' % (DIRECTORY_INSTANCE_DIR),
+ { 'foldername' : '%s/functional-tests' % (DIRECTORY_INSTANCE_DIR),
'hostname' : STAF_REMOTE_HOSTNAME }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
index a50c295..7769cc6 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -107,7 +107,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache2.ldif' % LDIF_DATA_DIR }
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache2.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -129,7 +129,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache3.ldif' % LDIF_DATA_DIR }
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache3.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -151,7 +151,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/core/ldifs/mod_entrycache4.ldif' % LDIF_DATA_DIR }
+ 'entryToBeModified' : '%s/core/ldifs/mod_entrycache4.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -173,7 +173,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_entrycache5.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_entrycache5.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index b5d8d65..684191c 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -133,7 +133,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -179,7 +179,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit2.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit2.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -224,7 +224,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit3.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -295,7 +295,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_searchsizelimit4.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index fc08a34..9537cc5 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -133,7 +133,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -179,7 +179,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit2.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit2.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -224,7 +224,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit3.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -295,7 +295,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/mod_timelimit4.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
index 62e44e9..9c3918b 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -82,7 +82,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/core_start.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/core_start.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
@@ -104,7 +104,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/core/ldifs/core_test_1K.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index 7d27bb4..a986b74 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -122,7 +122,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % LDIF_DATA_DIR }
+ 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % STAGED_DATA_DIR }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
index d052cfc..bdf0432 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_bob_jks.xml
@@ -70,7 +70,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/jks/jks_startup.ldif' % LDIF_DATA_DIR,
+ 'entryToBeAdded' : '%s/security/jks/jks_startup.ldif' % STAGED_DATA_DIR,
'extraParams' : '-Z -X' }
</call>
@@ -107,7 +107,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/modrdn/a1_modrdn.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/jks/modrdn/a1_modrdn.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
@@ -144,7 +144,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/add/bin_a1_in.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/jks/add/bin_a1_in.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
@@ -181,7 +181,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/mod/bin_a1_mod.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/jks/mod/bin_a1_mod.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
@@ -218,7 +218,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/jks/del/bin_a1_out.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/jks/del/bin_a1_out.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
index 00ce459..1fc7cbe 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_bob_pkcs12.xml
@@ -45,7 +45,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/pkcs12/pkcs12_startup.ldif' % LDIF_DATA_DIR,
+ 'entryToBeAdded' : '%s/security/pkcs12/pkcs12_startup.ldif' % STAGED_DATA_DIR,
'extraParams' : '-Z -X' }
</call>
@@ -68,7 +68,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/modrdn/a1_modrdn.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/pkcs12/modrdn/a1_modrdn.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
@@ -91,7 +91,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/add/bin_a1_in.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/pkcs12/add/bin_a1_in.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
@@ -114,7 +114,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/mod/bin_a1_mod.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/pkcs12/mod/bin_a1_mod.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
@@ -137,7 +137,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_SSL_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/pkcs12/del/bin_a1_out.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/pkcs12/del/bin_a1_out.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-Z -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
index e146160..299d2c9 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_bob_startTLS.xml
@@ -46,7 +46,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/security/startTLS/starttls_startup.ldif' % LDIF_DATA_DIR,
+ 'entryToBeAdded' : '%s/security/startTLS/starttls_startup.ldif' % STAGED_DATA_DIR,
'extraParams' : '-q -X' }
</call>
@@ -69,7 +69,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/add/bin_a1_tls_in.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/startTLS/add/bin_a1_tls_in.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-q -X' }
</call>
@@ -92,7 +92,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/mod/bin_a1_tls_mod.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/startTLS/mod/bin_a1_tls_mod.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-q -X' }
</call>
@@ -115,7 +115,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/security/startTLS/del/bin_a1_tls_out.ldif' % LDIF_DATA_DIR ,
+ 'entryToBeModified' : '%s/security/startTLS/del/bin_a1_tls_out.ldif' % STAGED_DATA_DIR ,
'extraParams' : '-q -X' }
</call>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
index d5fd332..d79a1d0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/setup/setup.xml
@@ -32,96 +32,125 @@
<function name="main_setup">
- <sequence>
+ <sequence>
- <!--- Prepare data files for transportation-->
- <message>
- 'Delete existing zip archive if it exists already.'
- </message>
+ <!-- Delete any existing files -->
+ <message>'Delete temporary staging area'</message>
+ <call function="'deletefolder'">
+ { 'foldername' : '%s' % (TMP_DATA_DIR),
+ 'hostname' : STAF_LOCAL_HOSTNAME }
+ </call>
+
+ <message>'Delete existing zip archive.'</message>
<call function="'deletefile'">
{ 'filename' : '%s/ldifdata.zip' % TMPDIR ,
'hostname' : STAF_LOCAL_HOSTNAME }
</call>
- <!--- Zip up contents of tests directory -->
+ <!-- Copy static data files to temporary staging area -->
+ <!-- LDIF files -->
+ <message>'Copy ldif data files'</message>
+ <call function="'CopyFolderByExtension'">
+ { 'srcfolder' : TESTS_DIR,
+ 'destfolder' : TMP_DATA_DIR,
+ 'extension' : 'ldif',
+ 'hostname' : STAF_LOCAL_HOSTNAME
+ }
+ </call>
+
+ <!-- Archive (gz) files -->
+ <message>'Copy gz data files'</message>
+ <call function="'CopyFolderByExtension'">
+ { 'srcfolder' : TESTS_DIR,
+ 'destfolder' : TMP_DATA_DIR,
+ 'extension' : 'gz',
+ 'hostname' : STAF_LOCAL_HOSTNAME
+ }
+ </call>
+
+ <!-- Dynamically create ldif files for staging -->
+ <!-- Modify SSL port to user-defined value -->
+ <script>
+ write_ldaps_ldif_file('%s' % (TMP_DATA_DIR), '%s' % (DIRECTORY_INSTANCE_SSL_PORT));
+ </script>
+
+ <!-- Zip up contents of tests directory -->
<message>
'Zip up data directory.'
</message>
<call function="'zipfile'">
- { 'zipfilename' : '%s/ldifdata.zip' % TMPDIR ,
- 'foldername' : TESTS_DIR ,
- 'relativeto' : TESTS_ROOT }
+ { 'zipfilename' : '%s/ldifdata.zip' % TMPDIR ,
+ 'foldername' : TMP_DATA_DIR ,
+ 'relativeto' : TMPDIR }
</call>
<!--- Copy data to remote host -->
<message>
- 'Copy tests to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
+ 'Copy tests to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
</message>
<call function="'copyfile'">
- { 'srcfile' : '%s/ldifdata.zip' % TMPDIR,
- 'destfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
- 'remotehost' : STAF_REMOTE_HOSTNAME }
+ { 'srcfile' : '%s/ldifdata.zip' % TMPDIR,
+ 'destfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
+ 'remotehost' : STAF_REMOTE_HOSTNAME }
</call>
<!--- Unzip contents of tests data on remote host -->
<message>
- 'Extract contents of test data %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
+ 'Extract contents of test data %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
</message>
<call function="'unzipfile'">
- { 'zipfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
- 'unzipdir' : '%s' % (DIRECTORY_INSTANCE_DIR),
- 'ziphost' : STAF_REMOTE_HOSTNAME }
+ { 'zipfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
+ 'unzipdir' : '%s' % (DIRECTORY_INSTANCE_DIR),
+ 'ziphost' : STAF_REMOTE_HOSTNAME }
</call>
<!--- Install DS Copy zip file -->
- <!--- XXX TODO XXX handle cases better -->
<message>
- 'Copy DS zip archive to %s on %s' % (DSTFILE,STAF_REMOTE_HOSTNAME)
+ 'Copy DS zip archive to %s on %s' % (DSTFILE,STAF_REMOTE_HOSTNAME)
</message>
<call function="'copyfile'">
{ 'srcfile' : SRCFILE,
- 'destfile' : DSTFILE,
- 'remotehost' : STAF_REMOTE_HOSTNAME }
+ 'destfile' : DSTFILE,
+ 'remotehost' : STAF_REMOTE_HOSTNAME }
</call>
<!--- Delete folder if it exists already-->
<message>
- 'Delete folder %s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ 'Delete folder %s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
</message>
<call function="'deletefolder'">
- { 'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
- 'hostname' : STAF_REMOTE_HOSTNAME }
+ { 'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
+ 'hostname' : STAF_REMOTE_HOSTNAME }
</call>
<!--- Install DS Extract zip file -->
- <!--- XXX TODO XXX handle cases better -->
<message>
- 'Extract DS zip archive to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
+ 'Extract DS zip archive to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
</message>
<call function="'unzipfile'">
- { 'zipfile' : DSTFILE,
- 'unzipdir' : '%s' % (DIRECTORY_INSTANCE_DIR),
- 'ziphost' : STAF_REMOTE_HOSTNAME }
+ { 'zipfile' : DSTFILE,
+ 'unzipdir' : '%s' % (DIRECTORY_INSTANCE_DIR),
+ 'ziphost' : STAF_REMOTE_HOSTNAME }
</call>
<!--- Test Case : Configure DS -->
<testcase name="'ConfigureDS'">
<sequence>
<message>
- 'Configure DS to run on port %s with base suffix %s' % (DIRECTORY_INSTANCE_PORT,DIRECTORY_INSTANCE_SFX)
+ 'Configure DS to run on port %s with base suffix %s' % (DIRECTORY_INSTANCE_PORT,DIRECTORY_INSTANCE_SFX)
</message>
<call function="'configureDS'">
{ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceSuffix' : DIRECTORY_INSTANCE_SFX }
</call>
<call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
</call>
</sequence>
</testcase>
- </sequence>
+ </sequence>
</function>
--
Gitblit v1.10.0