From da40de5b860952ec063b246545632642d00ba0bf Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Fri, 16 Sep 2011 16:28:35 +0000
Subject: [PATCH] Clean of use of data and temp data in functional tests
---
opends/tests/staf-tests/shared/functions/dsadm.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
index 15d5d04..cff058d 100755
--- a/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -1224,7 +1224,9 @@
<message>'Expected number of entries is %s' % expectedNoEntries</message>
<call function="'ldapSearchWithScript'">
- { 'dsInstanceHost' : myhost ,
+ { 'location' : myLocation ,
+ 'dsPath' : myPath,
+ 'dsInstanceHost' : myhost ,
'dsInstancePort' : myport ,
'dsInstanceDn' : mydn ,
'dsInstancePswd' : mypswd ,
@@ -1253,7 +1255,9 @@
<iterate var="expectedEntry" in="expectedEntries">
<sequence>
<call function="'ldapSearchWithScript'">
- { 'dsInstanceHost' : myhost ,
+ { 'location' : myLocation ,
+ 'dsPath' : myPath,
+ 'dsInstanceHost' : myhost ,
'dsInstancePort' : myport ,
'dsInstanceDn' : mydn ,
'dsInstancePswd' : mypswd ,
@@ -1705,6 +1709,9 @@
STAFCmd='%s/backup%s' % (dsBinPath,fileExt)
if backupDir:
+ if not os.path.exists(os.path.dirname(backupDir)):
+ os.makedirs(os.path.dirname(backupDir))
+
STAFCmdParamsList.append('-d %s' % backupDir)
if backEnd:
@@ -1877,6 +1884,9 @@
<!-- Build the backup task configuration object -->
<script>
+ if not os.path.exists(os.path.dirname(backupDir)):
+ os.makedirs(os.path.dirname(backupDir))
+
ldifLines=[]
ldifLines.append('dn: %s' % taskDN)
ldifLines.append('objectclass: top')
--
Gitblit v1.10.0