From 61bfbe2aee8915fb71ed8569457f86777091a72b Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 27 Sep 2007 10:04:06 +0000
Subject: [PATCH] Issue 1222 path and name of to config.py should be parameterized
---
opends/tests/functional-tests/staf-installer.xml | 2 +-
opends/tests/functional-tests/staf-installer/staf-installer.properties | 1 -
opends/tests/functional-tests/testcases/runTestJob.xml | 23 ++++++++---------------
3 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/opends/tests/functional-tests/staf-installer.xml b/opends/tests/functional-tests/staf-installer.xml
index ce18f25..9269bc6 100644
--- a/opends/tests/functional-tests/staf-installer.xml
+++ b/opends/tests/functional-tests/staf-installer.xml
@@ -571,7 +571,7 @@
<target name="run-tests"
depends="status-do,run-tests-check,run-tests-cant,run-tests-prepare,run-my-tests-default-plan"
if="run-tests.proceed">
- <property name="tests.request" value="EXECUTE FILE ${tests.xml} JOBNAME OpenDS_Functional_Tests SCRIPTFILE ${tests.config} SCRIPTFILE ${tests.python} WAIT CLEARLOGS"/>
+ <property name="tests.request" value="EXECUTE FILE ${tests.xml} JOBNAME OpenDS_Functional_Tests SCRIPTFILE ${tests.config} WAIT CLEARLOGS"/>
<condition property="tests.replay.script" value="replay.bat" else="replay.sh">
<os family="windows"/>
</condition>
diff --git a/opends/tests/functional-tests/staf-installer/staf-installer.properties b/opends/tests/functional-tests/staf-installer/staf-installer.properties
index 9ee516c..623c712 100644
--- a/opends/tests/functional-tests/staf-installer/staf-installer.properties
+++ b/opends/tests/functional-tests/staf-installer/staf-installer.properties
@@ -71,7 +71,6 @@
tests.config.stubs=${staf.installer.dir}${file.separator}${tests.config.file}.stubs
tests.config=${tests.config.dir}${file.separator}${tests.config.file}
tests.config.backup=${tests.config}.orig
-tests.python=${tests.dir}${file.separator}shared${file.separator}python${file.separator}security.py
tests.xml=${tests.dir}${file.separator}testcases${file.separator}runTestJob.xml
# Tests section - bottom
diff --git a/opends/tests/functional-tests/testcases/runTestJob.xml b/opends/tests/functional-tests/testcases/runTestJob.xml
index 7f620f0..3137170 100644
--- a/opends/tests/functional-tests/testcases/runTestJob.xml
+++ b/opends/tests/functional-tests/testcases/runTestJob.xml
@@ -29,29 +29,22 @@
<stax>
<defaultcall function="start_job"/>
<function name="start_job">
- <function-single-arg>
- <function-optional-arg name="config" default="''"/>
- </function-single-arg>
<sequence>
<script>
STAXLogMessage = 1
</script>
-
- <script>
- if config:
- import os, sys
- myconfigpath,myconfigfile=os.path.split(config)
- sys.path.append("%s" % myconfigpath )
- from config import *
- else:
- myconfigpath='%s/config' % TESTS_DIR
- myconfigfile='config.py'
- </script>
+
+ <if expr="not STAXJobScriptFiles">
+ <sequence>
+ <message>'No script file (config.py) is specified. Unable to run the tests.'</message>
+ <return></return>
+ </sequence>
+ </if>
<job name="'Job: %s %s' % (STAF_REMOTE_HOSTNAME,TEST_OS_STRING) " monitor="1" clearlogs="'Enabled'" logtcstartstop="'Enabled'">
<job-file>'%s/testcases/runFuncTests.xml' % TESTS_DIR</job-file>
- <job-scriptfiles machine="STAF_LOCAL_HOSTNAME">['%s/%s' % (myconfigpath,myconfigfile) ]</job-scriptfiles>
+ <job-scriptfiles machine="STAF_LOCAL_HOSTNAME"> STAXJobScriptFiles </job-scriptfiles>
<job-action>
<log>'Started sub-job %s on %s' % (STAXSubJobID,STAF_REMOTE_HOSTNAME)</log>
</job-action>
--
Gitblit v1.10.0