From 9ea7e034048ed50c9d2426094ee9285f6e9e82d3 Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Tue, 14 Aug 2007 03:49:33 +0000
Subject: [PATCH] fix for tests launching multiple commands in parallel: block names must be unique.

---
 opends/tests/functional-tests/shared/functions/utils.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/opends/tests/functional-tests/shared/functions/utils.xml b/opends/tests/functional-tests/shared/functions/utils.xml
index e9c2a81..6cd0302 100755
--- a/opends/tests/functional-tests/shared/functions/utils.xml
+++ b/opends/tests/functional-tests/shared/functions/utils.xml
@@ -1185,11 +1185,16 @@
       </function-arg-def>
     </function-map-args>
     <sequence>
+      <script>
+        import random
+        random.seed()
+        _id = '%s#%d' % (strftime('%Y-%m-%d %H:%M:%S',localtime()),random.randint(0,9))
+      </script>
       <message>
-        'Running command:\n %s %s\nenv: %s\nworkdir: %s' % (command,arguments,env,path)
+        '%s: Running command:\n %s %s\nenv: %s\nworkdir: %s' % (_id,command,arguments,env,path)
       </message>
       
-      <block name="'runCommand wrapper'">
+      <block name="'%s:Wrapper for %s' % (_id,command)">
         <process name="name">
           <location>location</location>
           <command>command</command>
@@ -1202,7 +1207,7 @@
         </process>
       </block>
       <message level="'info'">
-        'Command returned:\n%s' % STAXResult[0][1]
+        '%s: Command returned:\n%s' % (_id,STAXResult[0][1])
       </message>
       <script>
         def dig(var):

--
Gitblit v1.10.0