From 4ce00bb51e15043e5dcb7a6a6dbe1c0792f85424 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Fri, 28 Jun 2013 14:53:04 +0000
Subject: [PATCH] Backport: Fixed replication tests (regression introduced by my previous commit)
---
opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index 6476298..b6f7e5b 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -267,7 +267,7 @@
<!-- Get the information about the server -->
<call function="'GetVar'">
- { 'location' : STAF_REMOTE_HOSTNAME,
+ { 'location' : dsHost,
'type' : 'shared',
'variable' : 'Job%s_ServerInfo' % STAXParentID
}
@@ -281,10 +281,13 @@
<script>
jobInfo=eval(STAFResult)
- if jobInfo.has_key(dsPath):
- serverInformation=jobInfo[dsPath]
+ instPath = '%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)
+ if jobInfo.has_key(instPath):
+ serverInformation=jobInfo[instPath]
dsVersion=serverInformation['server version']
-
+ else:
+ dsVersion='unknown'
+
STAFCmdParamsList=[]
STAFCmdParams=''
</script>
--
Gitblit v1.10.0