From a4565cc54b62c0c99ef0dce272ffc11dd02106e8 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 11 Apr 2008 09:15:55 +0000
Subject: [PATCH] Display error instead of silent mode and clean the code
---
opends/tests/system-tests/phases/main_run_lib.xml | 14 ++++----------
opends/tests/system-tests/phases/main_run.xml | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/opends/tests/system-tests/phases/main_run.xml b/opends/tests/system-tests/phases/main_run.xml
index a47cab2..25d5338 100644
--- a/opends/tests/system-tests/phases/main_run.xml
+++ b/opends/tests/system-tests/phases/main_run.xml
@@ -275,6 +275,16 @@
ERR_NUM_TOTAL = ERR_NUM_TOTAL + ERR_NUM[0]
</script>
</sequence>
+ <else>
+ <sequence>
+ <message>
+ 'ERROR : preConfiguration phase is enabled and file \
+ does not exist on %s : %s' % \
+ (STAXServiceMachine,preConfigurationFile)
+ </message>
+ <script>ERR_NUM_TOTAL += 1 </script>
+ </sequence>
+ </else>
</if>
</sequence>
</if>
@@ -324,6 +334,16 @@
ERR_NUM_TOTAL = ERR_NUM_TOTAL + ERR_NUM[0]
</script>
</sequence>
+ <else>
+ <sequence>
+ <message>
+ 'ERROR : postConfiguration phase is enabled and file \
+ does not exist on %s : %s' % \
+ (STAXServiceMachine,postConfigurationFile)
+ </message>
+ <script>ERR_NUM_TOTAL += 1 </script>
+ </sequence>
+ </else>
</if>
</sequence>
</if>
diff --git a/opends/tests/system-tests/phases/main_run_lib.xml b/opends/tests/system-tests/phases/main_run_lib.xml
index ff75791..fe94e41 100644
--- a/opends/tests/system-tests/phases/main_run_lib.xml
+++ b/opends/tests/system-tests/phases/main_run_lib.xml
@@ -172,12 +172,9 @@
'fileFd' : NO_FILE
}
</call>
- <script>
- fullHostName = '%s%s' % (instance.getHost(),DOMAIN[0])
- </script>
<call function="'copyFolder'">
{
- 'remoteHost' : fullHostName,
+ 'remoteHost' : '%s%s' % (instance.getHost(),DOMAIN[0]),
'fromDirectory' : '%s/phases/shared/java' % TESTS_DIR,
'toDirectory' : '%s/phases/shared/java' % LOCAL_TESTS_DIR,
'fileFd' : NO_FILE
@@ -263,13 +260,10 @@
}
</call>
</if>
- <script>
- fullHostName = '%s%s' % (client.getHost(),DOMAIN[0])
- </script>
<!-- Copy shared clients -->
<call function="'copyFolder'">
{
- 'remoteHost' : fullHostName,
+ 'remoteHost' : '%s%s' % (client.getHost(),DOMAIN[0]),
'fromDirectory' : '%s/clients' % TESTS_DIR,
'toDirectory' : '%s/clients' % LOCAL_TESTS_DIR,
'fileFd' : NO_FILE
@@ -371,7 +365,7 @@
{
'srcFile' : '%s/cnMonitor.txt' % instance.getLogDir(),
'destFile' : '%s/cnMonitor.txt' % instance.getLogDir(),
- 'location' : instance.getHost(),
+ 'location' : '%s%s' % (instance.getHost(),DOMAIN[0]),
'remoteHost' : STAXServiceMachine,
'fileFd' : NO_FILE
}
@@ -382,7 +376,7 @@
{
'srcFile' : '%s/config/config.ldif' % instance.getInstallDir(),
'destFile' : '%s/config.ldif' % instance.getLogDir(),
- 'location' : instance.getHost(),
+ 'location' : '%s%s' % (instance.getHost(),DOMAIN[0]),
'remoteHost' : STAXServiceMachine,
'fileFd' : NO_FILE
}
--
Gitblit v1.10.0