From 50f8a165bf3b68795f4f8d424286788c1abb2a13 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 13 Mar 2007 09:18:27 +0000
Subject: [PATCH] Issue 1354 use block element for test groups and suites
---
opends/tests/functional-tests/testcases/setup/setup.xml | 258 ++++++++++++++++++++++++++-------------------------
1 files changed, 133 insertions(+), 125 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/setup/setup.xml b/opends/tests/functional-tests/testcases/setup/setup.xml
index e2bf86b..adf9ba9 100755
--- a/opends/tests/functional-tests/testcases/setup/setup.xml
+++ b/opends/tests/functional-tests/testcases/setup/setup.xml
@@ -32,135 +32,143 @@
<function name="main_setup">
<sequence>
-
- <!-- Locally delete any existing files from staging area -->
- <message>'Delete the temporary staging area'</message>
- <call function="'deleteFolder'">
- { 'location' : STAXServiceMachine,
- 'foldername' : '%s' % TMP_DATA_DIR }
- </call>
- <!-- Locally delete any existing files from the zip archive -->
- <message>'Delete existing zip archive.'</message>
- <call function="'deleteFile'">
- { 'location' : STAXServiceMachine,
- 'filename' : '%s/ldifdata.zip' % TMPDIR }
- </call>
-
- <!--- Delete folder if it exists on remote host-->
- <message>
- 'Delete folder %s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </message>
- <call function="'deleteFolder'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
- }
- </call>
+ <block name="'setup'">
- <!-- Locally copy static data files to temporary staging area -->
- <!-- LDIF (.ldif) files -->
- <message>'Copy ldif data files'</message>
- <call function="'CopyFolderByExtension'">
- { 'location' : STAXServiceMachine,
- 'srcfolder' : TESTS_DIR,
- 'destfolder' : TMP_DATA_DIR,
- 'extension' : 'ldif' }
- </call>
-
- <!-- PWD (.pwd) files -->
- <call function="'CopyFolderByExtension'">
- { 'location' : STAXServiceMachine,
- 'srcfolder' : TESTS_DIR,
- 'destfolder' : TMP_DATA_DIR,
- 'extension' : 'pwd' }
- </call>
-
- <!-- Archive (.gz) files -->
- <message>'Copy gz data files'</message>
- <call function="'CopyFolderByExtension'">
- { 'location' : STAXServiceMachine,
- 'srcfolder' : TESTS_DIR,
- 'destfolder' : TMP_DATA_DIR,
- 'extension' : 'gz' }
- </call>
-
- <!-- Dynamically create ldif files for staging -->
- <!-- Modify SSL port to a user-defined value -->
- <script>
- write_ldaps_ldif_file('%s/shared/data' % (TMP_DATA_DIR), '%s' % (DIRECTORY_INSTANCE_SSL_PORT));
- </script>
+ <sequence>
- <!-- Zip up contents of tests directory -->
- <message>
- 'Zip up data directory.'
- </message>
- <call function="'zipUpFile'">
- { 'location' : STAXServiceMachine,
- 'zipfile' : '%s/ldifdata.zip' % TMPDIR ,
- 'folder' : TMP_DATA_DIR ,
- 'relativeto' : TMPDIR }
- </call>
-
- <!--- Copy staging data to remote host -->
- <message>
- 'Copy tests to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
- </message>
- <call function="'copyFile'">
- { 'location' : STAXServiceMachine,
- 'srcfile' : '%s/ldifdata.zip' % TMPDIR,
- 'destfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
- 'remotehost' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <!--- Unzip contents of staging data on remote host -->
- <message>
- 'Extract contents of test data %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
- </message>
- <call function="'unZipFile'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'zipfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
- 'unzipdir' : '%s' % DIRECTORY_INSTANCE_DIR,
- }
- </call>
-
- <!--- Install DS Copy zip file -->
- <message>
- 'Copy DS zip archive to %s on %s' % (DSTFILE,STAF_REMOTE_HOSTNAME)
- </message>
- <call function="'copyFile'">
- { 'srcfile' : SRCFILE,
- 'destfile' : DSTFILE,
+ <!-- Locally delete any existing files from staging area -->
+ <message>'Delete the temporary staging area'</message>
+ <call function="'deleteFolder'">
+ { 'location' : STAXServiceMachine,
+ 'foldername' : '%s' % TMP_DATA_DIR }
+ </call>
+
+ <!-- Locally delete any existing files from the zip archive -->
+ <message>'Delete existing zip archive.'</message>
+ <call function="'deleteFile'">
+ { 'location' : STAXServiceMachine,
+ 'filename' : '%s/ldifdata.zip' % TMPDIR }
+ </call>
+
+ <!--- Delete folder if it exists on remote host-->
+ <message>
+ 'Delete folder %s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ </message>
+ <call function="'deleteFolder'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
+ }
+ </call>
+
+ <!-- Locally copy static data files to temporary staging area -->
+ <!-- LDIF (.ldif) files -->
+ <message>'Copy ldif data files'</message>
+ <call function="'CopyFolderByExtension'">
+ { 'location' : STAXServiceMachine,
+ 'srcfolder' : TESTS_DIR,
+ 'destfolder' : TMP_DATA_DIR,
+ 'extension' : 'ldif' }
+ </call>
+
+ <!-- PWD (.pwd) files -->
+ <call function="'CopyFolderByExtension'">
+ { 'location' : STAXServiceMachine,
+ 'srcfolder' : TESTS_DIR,
+ 'destfolder' : TMP_DATA_DIR,
+ 'extension' : 'pwd' }
+ </call>
+
+ <!-- Archive (.gz) files -->
+ <message>'Copy gz data files'</message>
+ <call function="'CopyFolderByExtension'">
+ { 'location' : STAXServiceMachine,
+ 'srcfolder' : TESTS_DIR,
+ 'destfolder' : TMP_DATA_DIR,
+ 'extension' : 'gz' }
+ </call>
+
+ <!-- Dynamically create ldif files for staging -->
+ <!-- Modify SSL port to a user-defined value -->
+ <script>
+ write_ldaps_ldif_file('%s/shared/data' % (TMP_DATA_DIR), '%s' % (DIRECTORY_INSTANCE_SSL_PORT));
+ </script>
+
+ <!-- Zip up contents of tests directory -->
+ <message>
+ 'Zip up data directory.'
+ </message>
+ <call function="'zipUpFile'">
+ { 'location' : STAXServiceMachine,
+ 'zipfile' : '%s/ldifdata.zip' % TMPDIR ,
+ 'folder' : TMP_DATA_DIR ,
+ 'relativeto' : TMPDIR }
+ </call>
+
+ <!--- Copy staging data to remote host -->
+ <message>
+ 'Copy tests to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
+ </message>
+ <call function="'copyFile'">
+ { 'location' : STAXServiceMachine,
+ 'srcfile' : '%s/ldifdata.zip' % TMPDIR,
+ 'destfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
'remotehost' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <!--- Install DS Extract zip file -->
- <message>
- 'Extract DS zip archive to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
- </message>
- <call function="'unZipFile'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'zipfile' : DSTFILE,
- 'unzipdir' : '%s' % DIRECTORY_INSTANCE_DIR }
- </call>
-
- <!--- Configure DS -->
- <sequence>
- <message>
- 'Configuring DS on %s' % STAF_REMOTE_HOSTNAME
- </message>
- <call function="'ConfigureDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsBaseDN' : DIRECTORY_INSTANCE_SFX }
- </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
+ </call>
+
+ <!--- Unzip contents of staging data on remote host -->
+ <message>
+ 'Extract contents of test data %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
+ </message>
+ <call function="'unZipFile'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'zipfile' : '%s/ldifdata.zip' % DIRECTORY_INSTANCE_DIR,
+ 'unzipdir' : '%s' % DIRECTORY_INSTANCE_DIR,
+ }
+ </call>
+
+ <!--- Install DS Copy zip file -->
+ <message>
+ 'Copy DS zip archive to %s on %s' % (DSTFILE,STAF_REMOTE_HOSTNAME)
+ </message>
+ <call function="'copyFile'">
+ { 'srcfile' : SRCFILE,
+ 'destfile' : DSTFILE,
+ 'remotehost' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <!--- Install DS Extract zip file -->
+ <message>
+ 'Extract DS zip archive to %s on %s' % (DIRECTORY_INSTANCE_DIR,STAF_REMOTE_HOSTNAME)
+ </message>
+ <call function="'unZipFile'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'zipfile' : DSTFILE,
+ 'unzipdir' : '%s' % DIRECTORY_INSTANCE_DIR }
+ </call>
+
+ <!--- Configure DS -->
+ <sequence>
+ <message>
+ 'Configuring DS on %s' % STAF_REMOTE_HOSTNAME
+ </message>
+ <call function="'ConfigureDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsBaseDN' : DIRECTORY_INSTANCE_SFX }
+ </call>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+ </sequence>
+
+ </sequence>
+
+ </block>
+
</sequence>
</function>
--
Gitblit v1.10.0