From b2f8624c6ccb7240948d0cd158773232013d1d64 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 04 Apr 2008 09:00:02 +0000
Subject: [PATCH] Major Problem: issue when using NFS path value for TMPDIR variable (staf copy loops for ever  when trying to copy a folder to itself)

---
 opends/tests/system-tests/phases/configuration/configuration_opends.xml |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/opends/tests/system-tests/phases/configuration/configuration_opends.xml b/opends/tests/system-tests/phases/configuration/configuration_opends.xml
index d15808e..ccd2ebc 100755
--- a/opends/tests/system-tests/phases/configuration/configuration_opends.xml
+++ b/opends/tests/system-tests/phases/configuration/configuration_opends.xml
@@ -54,9 +54,15 @@
       <!-- ===== Start instances ===== -->
       <paralleliterate in="topoInstances" var="instance">
         <sequence>
+          <call function="'getLogFileName'">
+            { 'type'   : 'instance',
+              'object' : instance,
+              'prefix' : filePrefix
+            }
+          </call>
           <script>
-            logName = '%s_%s' % (instance.getHost(),instance.getName())
-            logFile = '%s/%s_%s.xml' % (LOG_XML_TMP_DIR,filePrefix,logName)
+            logFile = STAXResult
+            
             fileList.append(logFile)
             
             cFileFd = open(logFile,'w')
@@ -111,9 +117,16 @@
                 i += 1
             
             instanceSource = topoInstances[i]
+          </script>
+          <call function="'getLogFileName'">
+            { 'type'   : 'instance',
+              'object' : instance,
+              'prefix' : filePrefix
+            }
+          </call>
+          <script>
+            logFile = STAXResult
             
-            logName = '%s_%s' % (instance.getHost(),instance.getName())
-            logFile = '%s/%s_%s.xml' % (LOG_XML_TMP_DIR,filePrefix,logName)
             # reopen existing files, no need to add in fileList variable 
             # as it has already been added
             cFileFd = open(logFile,'a')
@@ -190,9 +203,14 @@
       <!--== Initialize replication (totalUpdate) ==-->
       <iterate in="topoInstances" var="instance">
         <sequence>
+          <call function="'getLogFileName'">
+            { 'type'   : 'instance',
+              'object' : instance,
+              'prefix' : filePrefix
+            }
+          </call>
           <script>
-            logName = '%s_%s' % (instance.getHost(),instance.getName())
-            logFile = '%s/%s_%s.xml' % (LOG_XML_TMP_DIR,filePrefix,logName)
+            logFile = STAXResult
             # reopen existing files, no need to add in fileList variable
             # as it has already been added
             cFileFd = open(logFile,'a')

--
Gitblit v1.10.0