From 1a2ad50be50beafee22b824890bf8723a2fbb808 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 01 Jul 2008 15:29:14 +0000
Subject: [PATCH] QA: System Test: allow monitoring client to use dedicated config.xml file
---
opendj-sdk/opends/tests/system-tests/clients/monitoring/monitoringLib.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/clients/monitoring/monitoringLib.xml b/opendj-sdk/opends/tests/system-tests/clients/monitoring/monitoringLib.xml
index c9acb58..6e21b2e 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/monitoring/monitoringLib.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/monitoring/monitoringLib.xml
@@ -66,10 +66,15 @@
if serverInstanceFromClient == NOT_DEFINED:
msg = '%s\nERROR: serverInstanceFromClient undefined,mandatory' % msg
-
+ needCopy = 0
configFile = getPropValue('configFile')
if configFile == NOT_DEFINED or configFile == '':
- configFile = '%s/MonitoringClient/config.xml' % client.getPath()
+ configFilePath = '%s/MonitoringClient/config.xml' % client.getPath()
+ elif configFile.find('/') == -1:
+ needCopy = 1
+ configFilePath = '%s/scenario/%s/%s' % \
+ (LOCAL_TESTS_DIR,DIR_NAME,configFile)
+
interval = getPropValue('interval')
unit = getPropValue('unit')
@@ -95,7 +100,7 @@
parms.append('-m "%s""' % serverInstance.getJVMPort())
parms.append('-D "%s" -w "%s"' % \
(DIRECTORY_INSTANCE_DN,DIRECTORY_INSTANCE_PSWD))
- parms.append('-f %s -r %s' % (configFile,client.getLogDir()))
+ parms.append('-f %s -r %s' % (configFilePath,client.getLogDir()))
if interval != NOT_DEFINED:
parms.append(' -i %s' % interval)
if unit != NOT_DEFINED:
@@ -126,6 +131,7 @@
</script>
+
</sequence>
</function>
--
Gitblit v1.10.0