From 504f0f7a278410099e966d7689c07b106f88cb06 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 13 Jun 2007 21:56:23 +0000
Subject: [PATCH] Issue 1784 data and temporary files must go into a unique folder
---
opends/tests/functional-tests/shared/functions/environment.xml | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/environment.xml b/opends/tests/functional-tests/shared/functions/environment.xml
index 114f212..5f9ac47 100755
--- a/opends/tests/functional-tests/shared/functions/environment.xml
+++ b/opends/tests/functional-tests/shared/functions/environment.xml
@@ -118,11 +118,9 @@
{ 'hostname' : STAF_REMOTE_HOSTNAME }
</call>
- <!-- XXXX this needs some cleanup XXXX -->
+ <!-- fixMe: this needs some cleanup -->
<script>
STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
OPENDS_BINPATH ='%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
OSName= STAXResult
winPattern=re.compile('win', re.IGNORECASE)
@@ -273,7 +271,12 @@
logsTestsDir='%s/testlogs' % logsDir
logsReportDir='%s/reports' % logsDir
logsSUTDir='%s/sutlogs' % logsDir
- logsTmpDir='%s/tmp' % logsDir
+ logsTestDataDir='%s/testdata' % logsDir
+ logsTempDir='%s/temp' % logsDir
+
+ relativeDataDir='shared/data'
+ logsLocalDataDir='%s/%s' % (logsTestDataDir,relativeDataDir)
+ logsRemoteDataDir='%s/%s' % (DIRECTORY_INSTANCE_DIR,relativeDataDir)
</script>
<message>
@@ -285,7 +288,38 @@
'type' : 'shared',
'variable' : 'Job%s_LogsDir=%s' % (STAXJobID,logsDir) }
</call>
-
+
+ <!-- Create folders -->
+ <message>'Create folder %s' % logsReportDir</message>
+ <call function="'createFolder'">
+ { 'location' : STAF_LOCAL_HOSTNAME,
+ 'foldername' : '%s' % logsReportDir }
+ </call>
+
+ <message>'Create folder %s' % logsTempDir</message>
+ <call function="'createFolder'">
+ { 'location' : STAF_LOCAL_HOSTNAME,
+ 'foldername' : '%s' % logsTempDir }
+ </call>
+
+ <message>'Create folder %s' % logsSUTDir</message>
+ <call function="'createFolder'">
+ { 'location' : STAF_LOCAL_HOSTNAME,
+ 'foldername' : '%s' % logsSUTDir }
+ </call>
+
+ <message>'Create folder %s' % logsTestsDir</message>
+ <call function="'createFolder'">
+ { 'location' : STAF_LOCAL_HOSTNAME,
+ 'foldername' : '%s' % logsTestsDir }
+ </call>
+
+ <message>'Create folder %s' % logsTestDataDir</message>
+ <call function="'createFolder'">
+ { 'location' : STAF_LOCAL_HOSTNAME,
+ 'foldername' : '%s' % logsTestDataDir }
+ </call>
+
</sequence>
</function>
--
Gitblit v1.10.0