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

[nobody at svn.erp5.org]

Author: vincent
Date: Wed Jan 31 11:50:45 2007
New Revision: 12476

URL: http://svn.erp5.org?rev=12476&view=rev
Log:
Fix call to os.kill to transmit the signal which was received.
Provide a valid signal number to kill_childs, because that parameter is now used.
Provide more universal defaults for runBenchmarks and userperzope variables.
Get dresult files from remote peers when applicable.

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=12476&r1=12475&r2=12476&view=diff
==============================================================================
--- erp5/trunk/utils/erp5mechanize/multiSmartRun.py (original)
+++ erp5/trunk/utils/erp5mechanize/multiSmartRun.py Wed Jan 31 11:50:45 2007
@@ -83,11 +83,11 @@
     del child_pid_dict[pid]
     if status != 0:
       log(1, 'PID %s ended with code %s.' % (pid, status))
-      kill_childs(0, None)
+      kill_childs(signal.SIGTERM, None)
 
 def kill_childs(signum, frame):
   for pid in child_pid_dict.iterkeys():
-    os.kill(pid)
+    os.kill(pid, signum)
   sys.exit()
 
 signal.signal(signal.SIGTERM, kill_childs)
@@ -116,8 +116,8 @@
 
 min_zope = 1
 max_zope = None
-runBenchmarks = './runBenchmarks.py'
-userperzope = './userperzope.py'
+runBenchmarks = 'runBenchmarks.py'
+userperzope = 'multi_userperzope.py'
 min_user = None
 max_user = None
 testsuite_list = []
@@ -296,6 +296,11 @@
       if callable(dresultpath):
         dresultpath = dresultpath(kw={'usercount': process_usercount_list[process_number],
                                       '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))
       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