From ba86e4e4d6c4debd4a24ae908b0eb4f203f414ff 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
---
opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml
index 0e4a90c..1ff6df1 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/stafcmd.xml
@@ -24,6 +24,7 @@
! CDDL HEADER END
!
! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2011 ForgeRock AS.
! -->
<stax>
<function name="copyFile">
@@ -57,6 +58,21 @@
</function-arg-def>
</function-map-args>
<sequence>
+ <message>
+ 'Copy file %s:%s to %s:%s.' \
+ % (location,srcfile,remotehost,destfile)
+ </message>
+
+ <script>
+ destfolder = os.path.dirname(destfile)
+ </script>
+
+ <call function="'createFolder'">
+ { 'location' : location,
+ 'foldername' : '%s' % destfolder
+ }
+ </call>
+
<stafcmd name="'STAF Command: Copy File'">
<location>'%s' % location</location>
<service>'fs'</service>
@@ -111,10 +127,17 @@
</function-arg-def>
</function-map-args>
<sequence>
+ <message>
+ 'Copy all %s Files from %s:%s to %s:%s.' \
+ % (extension,location,srcfolder,remotehost,destfolder)
+ </message>
<stafcmd name="'STAF Command: Copy all %s Files.' % (extension)">
<location>'%s' % location</location>
<service>'fs'</service>
- <request>'COPY DIRECTORY %s TODIRECTORY %s TOMACHINE %s EXT %s RECURSE' % (srcfolder,destfolder,remotehost,extension) </request>
+ <request>
+ 'COPY DIRECTORY %s TODIRECTORY %s TOMACHINE %s EXT %s RECURSE' \
+ % (srcfolder,destfolder,remotehost,extension)
+ </request>
</stafcmd>
<script>
cmdRC=RC
@@ -159,6 +182,10 @@
</function-arg-def>
</function-map-args>
<sequence>
+ <message>
+ 'Copy folder %s:%s to %s:%s.' \
+ % (location,srcfolder,remotehost,destfolder)
+ </message>
<stafcmd name="'STAF Command: Copy %s folder to %s.' % (srcfolder,destfolder)">
<location>'%s' % location</location>
<service>'fs'</service>
--
Gitblit v1.10.0