From 8dec4a98ad5855963901f16379ca0458f76d0860 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Thu, 12 Apr 2007 18:17:07 +0000
Subject: [PATCH] Fix for situations where python scripts access ldif files on local machine and ldapmodify operations are performed with ldif files on the remote machine.
---
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 126 +++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 99faa85..30aa92d 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -165,8 +165,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci1.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci1.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -178,7 +178,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -326,8 +326,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci2.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci2.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -339,7 +339,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -487,8 +487,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci3.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci3.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -496,11 +496,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -667,8 +667,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci4.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci4.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -676,11 +676,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -842,8 +842,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci5.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci5.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -851,11 +851,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -988,8 +988,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci6.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci6.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -997,11 +997,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1054,8 +1054,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci7.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci7.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1063,11 +1063,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1120,8 +1120,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci8.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci8.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1129,11 +1129,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 21">
@@ -1191,8 +1191,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci9.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci9.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1200,11 +1200,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1351,8 +1351,8 @@
<call function="'testCase_Preamble'"/>
<script>
- curr_aci_ldif_file = '%s/aci/aci_targetattr/add_aci10.ldif' % LOCAL_DATA_DIR
- curr_aci=retrieve_aci('%s' % curr_aci_ldif_file);
+ curr_aci_ldif_file = 'add_aci10.ldif'
+ curr_aci=retrieve_aci('%s/aci/aci_targetattr/%s' % (LOCAL_DATA_DIR,curr_aci_ldif_file));
</script>
<message>
@@ -1360,11 +1360,11 @@
</message>
<call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s' % curr_aci_ldif_file }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (STAGED_DATA_DIR,curr_aci_ldif_file) }
</call>
<if expr="RC != 0">
@@ -1434,7 +1434,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % STAGED_DATA_DIR }
+ 'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % STAGED_DATA_DIR }
</call>
<if expr="RC != 0">
--
Gitblit v1.10.0