From 007f0c4eab1a4fae4a2ba20373a12e5a666bebb8 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Wed, 23 Nov 2011 14:42:23 +0000
Subject: [PATCH] Fix for more test data files not going into correct place
---
opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
index 49621c2..c13ad37 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
@@ -398,11 +398,11 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' % (filename,local.temp,
- clientDataDir)
+ client.getTmpDir())
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
- 'destfile' : '%s/%s' % (clientDataDir,filename),
+ 'destfile' : '%s/%s' % (client.getTmpDir(),filename),
'remotehost' : client.getHostname() }
</call>
@@ -414,7 +414,7 @@
'dsInstancePort' : master.getPort() ,
'dsInstanceDn' : master.getRootDn() ,
'dsInstancePswd' : master.getRootPwd() ,
- 'dsFilename' : '%s/%s' % (clientDataDir, filename)
+ 'dsFilename' : '%s/%s' % (client.getTmpDir(), filename)
}
</call>
@@ -502,11 +502,11 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' % (filename,local.temp,
- clientDataDir)
+ client.getTmpDir())
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
- 'destfile' : '%s/%s' % (clientDataDir,filename),
+ 'destfile' : '%s/%s' % (client.getTmpDir(),filename),
'remotehost' : client.getHostname()
}
</call>
@@ -519,7 +519,7 @@
'dsInstancePort' : master.getPort() ,
'dsInstanceDn' : master.getRootDn() ,
'dsInstancePswd' : master.getRootPwd() ,
- 'dsFilename' : '%s/%s' % (clientDataDir, filename)
+ 'dsFilename' : '%s/%s' % (client.getTmpDir(), filename)
}
</call>
@@ -607,11 +607,11 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' % (filename,local.temp,
- clientDataDir)
+ client.getTmpDir())
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
- 'destfile' : '%s/%s' % (clientDataDir,filename),
+ 'destfile' : '%s/%s' % (client.getTmpDir(),filename),
'remotehost' : client.getHostname() }
</call>
@@ -623,7 +623,7 @@
'dsInstancePort' : master.getPort() ,
'dsInstanceDn' : master.getRootDn() ,
'dsInstancePswd' : master.getRootPwd() ,
- 'dsFilename' : '%s/%s' % (clientDataDir, filename)
+ 'dsFilename' : '%s/%s' % (client.getTmpDir(), filename)
}
</call>
@@ -705,11 +705,11 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' % (filename,local.temp,
- clientDataDir)
+ client.getTmpDir())
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
- 'destfile' : '%s/%s' % (clientDataDir,filename),
+ 'destfile' : '%s/%s' % (client.getTmpDir(),filename),
'remotehost' : client.getHostname()
}
</call>
@@ -722,7 +722,7 @@
'dsInstancePort' : master.getPort() ,
'dsInstanceDn' : master.getRootDn() ,
'dsInstancePswd' : master.getRootPwd() ,
- 'dsFilename' : '%s/%s' % (clientDataDir, filename)
+ 'dsFilename' : '%s/%s' % (client.getTmpDir(), filename)
}
</call>
@@ -815,11 +815,11 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' % (filename,local.temp,
- clientDataDir)
+ client.getTmpDir())
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
- 'destfile' : '%s/%s' % (clientDataDir,filename),
+ 'destfile' : '%s/%s' % (client.getTmpDir(),filename),
'remotehost' : client.getHostname()
}
</call>
@@ -832,7 +832,7 @@
'dsInstancePort' : master.getPort() ,
'dsInstanceDn' : master.getRootDn() ,
'dsInstancePswd' : master.getRootPwd() ,
- 'dsFilename' : '%s/%s' % (clientDataDir, filename)
+ 'dsFilename' : '%s/%s' % (client.getTmpDir(), filename)
}
</call>
@@ -933,11 +933,11 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
'Copy %s file from %s to %s' % (filename,local.temp,
- clientDataDir)
+ client.getTmpDir())
</message>
<call function="'copyFile'">
{ 'srcfile' : filePath,
- 'destfile' : '%s/%s' % (clientDataDir,filename),
+ 'destfile' : '%s/%s' % (client.getTmpDir(),filename),
'remotehost' : client.getHostname() }
</call>
@@ -949,7 +949,7 @@
'dsInstancePort' : master.getPort() ,
'dsInstanceDn' : master.getRootDn() ,
'dsInstancePswd' : master.getRootPwd() ,
- 'dsFilename' : '%s/%s' % (clientDataDir, filename)
+ 'dsFilename' : '%s/%s' % (client.getTmpDir(), filename)
}
</call>
--
Gitblit v1.10.0