From 7e01185d45663487618e3c8c4d1412d88954b7ea Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Mon, 20 Aug 2007 17:01:58 +0000
Subject: [PATCH] runCommand does not always pass location
---
opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index 05e8fb2..7f2cae1 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -138,7 +138,8 @@
'%s %s' % (STAFCmd, STAFCmdParams)
</message>
<call function="'runCommand'">
- { 'name' : 'Setup DS Script',
+ { 'location' : location,
+ 'name' : 'Setup DS Script',
'command' : STAFCmd,
'arguments' : STAFCmdParams,
'path' : dsPath
@@ -316,7 +317,8 @@
</message>
<call function="'runCommand'">
- { 'name' : 'Setup DS Script',
+ { 'location' : location,
+ 'name' : 'Setup DS Script',
'command' : STAFCmd,
'arguments' : STAFCmdParams
}
@@ -412,7 +414,8 @@
</message>
<call function="'runCommand'">
- { 'command' : STAFCmd,
+ { 'location' : location,
+ 'command' : STAFCmd,
'arguments' : STAFCmdParams,
'location' : location
}
@@ -651,7 +654,8 @@
</message>
<call function="'runCommand'">
- { 'name' : 'Stop DS Script',
+ { 'location' : location,
+ 'name' : 'Stop DS Script',
'command' : STAFCmd,
'arguments' : STAFCmdParams
}
@@ -847,7 +851,8 @@
'%s/import-ldif%s -l %s -n %s %s' % (dsBinPath,fileExt,ldifFile,backEnd,extraParams)
</message>
<call function="'runCommand'">
- { 'name' : 'Offline Import',
+ { 'location' : location,
+ 'name' : 'Offline Import',
'command' : '%s/import-ldif%s' % (dsBinPath,fileExt),
'arguments' : '-l %s -n %s %s' % (ldifFile,backEnd,extraParams)
}
@@ -1087,7 +1092,8 @@
</message>
<call function="'runCommand'">
- { 'name' : 'Offline Import Script',
+ { 'location' : location,
+ 'name' : 'Offline Import Script',
'command' : STAFCmd,
'arguments' : STAFCmdParams
}
@@ -1575,7 +1581,8 @@
'%s/export-ldif%s -l %s -n %s %s' % (dsBinPath,fileExt,ldifFile,backEnd,extraParams)
</message>
<call function="'runCommand'">
- { 'name' : 'Ldif Export',
+ { 'location' : location,
+ 'name' : 'Ldif Export',
'command' : '%s/export-ldif%s' % (dsBinPath,fileExt),
'arguments' : '-l %s -n %s %s' % (ldifFile,backEnd,extraParams)
}
--
Gitblit v1.10.0