[Erp5-report] r12481 - /erp5/trunk/utils/erp5mechanize/multiSmartRun.py

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Jan 31 14:46:19 2007
New Revision: 12481

URL: http://svn.erp5.org?rev=12481&view=rev
Log:
Remove a duplicate log & add more details to the remaining one.
Do not use background_execute to gather result files, it can be done sequentially.

Modified:
    erp5/trunk/utils/erp5mechanize/multiSmartRun.py

Modified: erp5/trunk/utils/erp5mechanize/multiSmartRun.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5mechanize/multiSmartRun.py?rev=12481&r1=12480&r2=12481&view=diff
==============================================================================
--- erp5/trunk/utils/erp5mechanize/multiSmartRun.py (original)
+++ erp5/trunk/utils/erp5mechanize/multiSmartRun.py Wed Jan 31 14:46:19 2007
@@ -60,7 +60,7 @@
     print message
 
 def execute(command):
-  log(2, command)
+  log(2, 'PWD:%s Command:%s' % (os.environ['PWD'], command))
   result = os.WEXITSTATUS(os.system(command))
   if result == 127:
     raise 'NotFound'
@@ -72,7 +72,6 @@
   pid = os.fork()
   if pid != 0:
     child_pid_dict[pid] = None
-    log(1, 'PID %s : %s' % (pid, command))
   else:
     execute(command)
     sys.exit(0)
@@ -280,9 +279,9 @@
                                     'zopecount': process_zopecount_list[process_number]})
       if host_suite_list is not None:
         # If runing in a distributed environment, recover everybody's results.
-        background_execute('scp %s:%s %s' % \
-                           (host_suite_list[process_number % len(host_suite_list)],
-                            resultpath, resultpath))
+        execute('scp %s:%s %s' % \
+                (host_suite_list[process_number % len(host_suite_list)],
+                 resultpath, resultpath))
       resultpath_list.append(resultpath)
     if execute('%s %s %s' % (userperzope, userperzope_args, ' '.join(resultpath_list))) != 0:
       print 'LIMIT REACHED: Test with %s users and %s zopes is out of limits.' % (current_usercount, current_zopecount)
@@ -298,9 +297,9 @@
                                       'zopecount': process_zopecount_list[process_number]})
       if host_suite_list is not None:
         # If runing in a distributed environment, recover everybody's results.
-        background_execute('scp %s:%s %s' % \
-                           (host_suite_list[process_number % len(host_suite_list)],
-                            dresultpath, dresultpath))
+        execute('scp %s:%s %s' % \
+                (host_suite_list[process_number % len(host_suite_list)],
+                dresultpath, dresultpath))
       resultpath_list.append(dresultpath)
     # Create a tarball with the total number of zope and users (from
     # multiSmartRun point of view) and a session identifier (to avoid