From 18b66914f6ca0af1f9c2fa109d0711f3a205e1c8 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Mon, 31 Mar 2008 11:10:07 +0000
Subject: [PATCH] copy clients on client hosts only if scheduler phase is enabled
---
opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml | 85 +++++++++++++++++++++++-------------------
opendj-sdk/opends/tests/system-tests/phases/main_run.xml | 5 +-
2 files changed, 49 insertions(+), 41 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/phases/main_run.xml b/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
index 577c79b..c860bbc 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
@@ -201,8 +201,9 @@
<!-- ============ PREAMBLE ===================================== -->
<call function="'mainPreamble'">
{
- 'instances' : instances,
- 'scheduler' : scheduler
+ 'instances' : instances,
+ 'scheduler' : scheduler,
+ 'runScheduler' : runScheduler
}
</call>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml b/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml
index 6e72d90..aa4f3aa 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml
@@ -99,6 +99,8 @@
clients list
</function-arg-description>
</function-arg-def>
+ <function-arg-def name="runScheduler" type="required">
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -211,45 +213,50 @@
}
</call>
<!-- Copy framework files needed to instance host -->
- <call function="'createFolder'">
- { 'location' : client.getHost(),
- 'foldername' : '%s/clients' % LOCAL_TESTS_DIR,
- 'fileFd' : NO_FILE
- }
- </call>
- <script>
- fullHostName = '%s%s' % (client.getHost(),DOMAIN[0])
- </script>
- <!-- Copy shared clients -->
- <call function="'copyFolder'">
- {
- 'remoteHost' : fullHostName,
- 'fromDirectory' : '%s/clients' % TESTS_DIR,
- 'toDirectory' : '%s/clients' % LOCAL_TESTS_DIR,
- 'fileFd' : NO_FILE
- }
- </call>
- <!-- Copy clients that are under the scenario directory -->
- <call function="'isFile'">
- {
- 'location' : STAXServiceMachine,
- 'fileName' : '%s/scenario/%s/clients' % (TESTS_DIR,DIR_NAME),
- }
- </call>
- <script>
- fileExist = STAXResult
- </script>
- <if expr="fileExist == TRUE">
- <call function="'copyFolder'">
- {
- 'remoteHost' : fullHostName,
- 'fromDirectory' : '%s/scenario/%s/clients' % \
- (TESTS_DIR,DIR_NAME),
- 'toDirectory' : '%s/scenario/%s/clients' % \
- (LOCAL_TESTS_DIR,DIR_NAME),
- 'fileFd' : NO_FILE
- }
- </call>
+ <if expr="runScheduler == 'true'">
+ <sequence>
+ <call function="'createFolder'">
+ { 'location' : client.getHost(),
+ 'foldername' : '%s/clients' % LOCAL_TESTS_DIR,
+ 'fileFd' : NO_FILE
+ }
+ </call>
+ <script>
+ fullHostName = '%s%s' % (client.getHost(),DOMAIN[0])
+ </script>
+ <!-- Copy shared clients -->
+ <call function="'copyFolder'">
+ {
+ 'remoteHost' : fullHostName,
+ 'fromDirectory' : '%s/clients' % TESTS_DIR,
+ 'toDirectory' : '%s/clients' % LOCAL_TESTS_DIR,
+ 'fileFd' : NO_FILE
+ }
+ </call>
+ <!-- Copy clients that are under the scenario directory -->
+ <call function="'isFile'">
+ {
+ 'location' : STAXServiceMachine,
+ 'fileName' : '%s/scenario/%s/clients' % \
+ (TESTS_DIR,DIR_NAME),
+ }
+ </call>
+ <script>
+ fileExist = STAXResult
+ </script>
+ <if expr="fileExist == TRUE">
+ <call function="'copyFolder'">
+ {
+ 'remoteHost' : fullHostName,
+ 'fromDirectory' : '%s/scenario/%s/clients' % \
+ (TESTS_DIR,DIR_NAME),
+ 'toDirectory' : '%s/scenario/%s/clients' % \
+ (LOCAL_TESTS_DIR,DIR_NAME),
+ 'fileFd' : NO_FILE
+ }
+ </call>
+ </if>
+ </sequence>
</if>
</sequence>
--
Gitblit v1.10.0