[Erp5-report] r9053 - /erp5/trunk/utils/erp5mechanize/runBenchmarks.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Aug  4 15:31:59 2006
New Revision: 9053

URL: http://svn.erp5.org?rev=9053&view=rev
Log:
Protect against too high value foir for --zopeinstance and --usercount.

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

Modified: erp5/trunk/utils/erp5mechanize/runBenchmarks.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5mechanize/runBenchmarks.py?rev=9053&r1=9052&r2=9053&view=diff
==============================================================================
--- erp5/trunk/utils/erp5mechanize/runBenchmarks.py (original)
+++ erp5/trunk/utils/erp5mechanize/runBenchmarks.py Fri Aug  4 15:31:59 2006
@@ -180,20 +180,20 @@
   # FIXME: there should be more signals.
   for signal_number in (signal.SIGHUP, signal.SIGSEGV, signal.SIGTERM):
     signal.signal(signal_number, sig_handler)
-  if zopecount is not None:
-    zopecount = int(zopecount)
+  if zopecount is None:
+    zopecount = len(instance_list)
   else:
-    zopecount = len(instance_list)
+    zopecount = min(int(zopecount), len(instance_list))
   # Get the maximum length of user_list defined on each tested instances.
   # Used for load balancing.
   maximum_length = 0
   for pos in xrange(zopecount):
     instance = instance_list[pos]
     maximum_length = max(maximum_length, len(instance['user_list']))
-  if usercount is not None:
-    usercount = int(usercount)
+  if usercount is None:
+    usercount = maximum_length
   else:
-    usercount = maximum_length
+    usercount = min(int(usercount), maximum_length)
   # Instanciate threads.
   # A threads represents a user on an instance. It will execute the whole
   # given test suite in the girven order.