From 6ca8f18556ae9fbfbf2c461ff15bae95156da62a Mon Sep 17 00:00:00 2001
From: madiot <madiot@localhost>
Date: Wed, 16 Sep 2009 13:48:41 +0000
Subject: [PATCH] tomcat-6.0.20 startup.bat return code now is consistent with unix make the backup of tomcat logs from remote to controler host
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml | 6 +++---
opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml | 10 +---------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
index 890fbdf..1c69881 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
@@ -111,16 +111,16 @@
'cleanup: stop webcontainer as described in config.py'
</message>
<call function="'stopWebcontainerWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME ,
+ { 'location' : STAF_REMOTE_HOSTNAME,
'wcPath' : '%s/%s-%s' % (WC_DIRECTORY,WC_TYPE,WC_VERSION) }
</call>
<message>'getting the list of generic known Issues spanning multiple tests'</message>
<call function="'runSTAFCommand'">
{ 'name' : 'backup tomcat log files',
- 'location' : STAXServiceMachine,
+ 'location' : STAF_REMOTE_HOSTNAME,
'service' : 'FS',
'request' : 'COPY ',
- 'arguments' : 'DIRECTORY %s/%s-%s/logs TODIRECTORY %s/tomcatLogBackup RECURSE' % (WC_DIRECTORY, WC_TYPE, WC_VERSION, local.temp)
+ 'arguments' : 'DIRECTORY %s/%s-%s/logs TODIRECTORY %s/tomcatLogBackup TOMACHINE %s RECURSE' % (WC_DIRECTORY, WC_TYPE, WC_VERSION, STAXServiceMachine, local.temp)
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml
index 3ec0c2d..e6b97bb 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/webcontainer.xml
@@ -329,21 +329,13 @@
'%s' % STAFCmd
</message>
- <!-- On Windows systems, startup command always returns 1 -->
- <script>
- if is_windows_platform(location):
- expectedRC=1
- else:
- expectedRC=0
- </script>
-
<call function="'runCommand'">
{ 'location' : location,
'command' : STAFCmd,
'envCmd' : STAFCmdEnv,
'name' : STAFCmd,
'path' : wcBinPath,
- 'expectedRC' : expectedRC
+ 'expectedRC' : 0
}
</call>
--
Gitblit v1.10.0