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/functional-tests/testcases/replication/encryption/encryption.xml | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 d1f0a95..49621c2 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
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2010 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
@@ -385,7 +386,7 @@
<script>
filename = 'replication_mod_add_binary.ldif'
- filePath = '%s/%s' % (local.data,filename)
+ filePath = '%s/%s' % (local.temp,filename)
binaryFilePath = '%s/replication/photo1.uu' % source.data
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'add'
@@ -396,7 +397,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,local.data,
+ 'Copy %s file from %s to %s' % (filename,local.temp,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -488,7 +489,7 @@
<script>
filename = 'replication_mod_replace_binary.ldif'
- filePath = '%s/%s' % (local.data,filename)
+ filePath = '%s/%s' % (local.temp,filename)
binaryFilePath = '%s/replication/photo2.uu' % source.data
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'replace'
@@ -500,7 +501,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,local.data,
+ 'Copy %s file from %s to %s' % (filename,local.temp,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -594,7 +595,7 @@
<script>
filename = 'replication_mod_delete_binary.ldif'
- filePath = '%s/%s' % (local.data,filename)
+ filePath = '%s/%s' % (local.temp,filename)
dn = 'uid=hmiller, ou=People,%s' % synchroSuffix
modif = 'delete'
attrType = 'jpegPhoto'
@@ -605,7 +606,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,local.data,
+ 'Copy %s file from %s to %s' % (filename,local.temp,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -692,7 +693,7 @@
<script>
filename = 'replication_modrdn.ldif'
- filePath = '%s/%s' % (local.data,filename)
+ filePath = '%s/%s' % (local.temp,filename)
dn = 'uid=kvaughan, ou=People,%s' % synchroSuffix
newrdn = 'uid=kvaughan2'
newsuperior = None
@@ -703,7 +704,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,local.data,
+ 'Copy %s file from %s to %s' % (filename,local.temp,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -802,7 +803,7 @@
<script>
filename = 'replication_modrdn_preserve.ldif'
- filePath = '%s/%s' % (local.data,filename)
+ filePath = '%s/%s' % (local.temp,filename)
dn = 'uid=jwallace, ou=People,%s' % synchroSuffix
newrdn = 'uid=igueye'
newsuperior = None
@@ -813,7 +814,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,local.data,
+ 'Copy %s file from %s to %s' % (filename,local.temp,
clientDataDir)
</message>
<call function="'copyFile'">
@@ -920,7 +921,7 @@
<script>
filename = 'replication_moddn.ldif'
- filePath = '%s/%s' % (local.data,filename)
+ filePath = '%s/%s' % (local.temp,filename)
dn = 'ou=People,%s' % synchroSuffix
newrdn = 'ou=Special People'
newsuperior = 'ou=Special Users,%s' % synchroSuffix
@@ -931,7 +932,7 @@
<!-- Copy the replication_mod ldif to client host -->
<message>
- 'Copy %s file from %s to %s' % (filename,local.data,
+ 'Copy %s file from %s to %s' % (filename,local.temp,
clientDataDir)
</message>
<call function="'copyFile'">
--
Gitblit v1.10.0