pass the [global] parameters into the Transaction

Author: Israel Fruchter (ifruchte)

multimechanize/core.py

@@ -44,7 +44,7 @@ def load_script(script_file):
 
 class UserGroup(multiprocessing.Process):
     def __init__(self, queue, process_num, user_group_name, num_threads,
-                 script_file, run_time, rampup, user_group_config):
+                 script_file, run_time, rampup, user_group_config, global_config):
         multiprocessing.Process.__init__(self)
         self.queue = queue
         self.process_num = process_num
@@ -55,6 +55,7 @@ def __init__(self, queue, process_num, user_group_name, num_threads,
         self.rampup = rampup
         self.start_time = time.time()
         self.user_group_config = user_group_config
+        self.global_config = global_config
 
     def run(self):
         # -- ENSURE: (Re-)Import script_module in forked Process
@@ -71,7 +72,7 @@ def run(self):
                                  self.start_time, self.run_time,
                                  self.user_group_name,
                                  script_module, self.script_file,
-                                 self.user_group_config)
+                                 self.user_group_config, self.global_config)
             agent_thread.daemon = True
             threads.append(agent_thread)
             agent_thread.start()
@@ -82,7 +83,7 @@ def run(self):
 
 class Agent(threading.Thread):
     def __init__(self, queue, process_num, thread_num, start_time, run_time,
-                 user_group_name, script_module, script_file, user_group_config):
+                 user_group_name, script_module, script_file, user_group_config, global_config):
         threading.Thread.__init__(self)
         self.queue = queue
         self.process_num = process_num
@@ -93,6 +94,7 @@ def __init__(self, queue, process_num, thread_num, start_time, run_time,
         self.script_module = script_module
         self.script_file   = script_file
         self.user_group_config = user_group_config
+        self.global_config = global_config
 
         # choose most accurate timer to use (time.clock has finer granularity
         # than time.time on windows, but shouldn't be used on other systems).
@@ -107,8 +109,10 @@ def run(self):
         spec = inspect.getargspec(self.script_module.Transaction.__init__)
         if len(spec.args) == 1 and spec.varargs is None and spec.keywords is None:
             trans = self.script_module.Transaction()        
-        else:
+        elif len(spec.args) == 2:
             trans = self.script_module.Transaction(self.user_group_config)
+        else:
+            trans = self.script_module.Transaction(self.user_group_config, self.global_config)
         trans.custom_timers = {}
 
         # scripts have access to these vars, which can be useful for loading unique data

multimechanize/utilities/run.py

@@ -77,7 +77,7 @@ def run_test(project_name, cmd_opts, remote_starter=None):
         remote_starter.test_running = True
         remote_starter.output_dir = None
 
-    run_time, rampup, results_ts_interval, console_logging, progress_bar, results_database, post_run_script, xml_report, user_group_configs = configure(project_name, cmd_opts)
+    run_time, rampup, results_ts_interval, console_logging, progress_bar, results_database, post_run_script, xml_report, user_group_configs, global_config = configure(project_name, cmd_opts)
 
     run_localtime = time.localtime()
     if cmd_opts.output_dir:
@@ -100,7 +100,7 @@ def run_test(project_name, cmd_opts, remote_starter=None):
         for _ in range(ug_config.num_processes):
             cur_rampup = rampup + ug_config.rampup
             ug = core.UserGroup(queue, process_num, ug_config.name, ug_config.num_threads,
-                                script_file, run_time, cur_rampup, ug_config)
+                                script_file, run_time, cur_rampup, ug_config, global_config)
             user_groups.append(ug)
             process_num += 1
     for user_group in user_groups:
@@ -183,7 +183,7 @@ def run_test(project_name, cmd_opts, remote_starter=None):
 def rerun_results(project_name, cmd_opts, results_dir):
     output_dir = '%s/%s/results/%s/' % (cmd_opts.projects_dir, project_name, results_dir)
     saved_config = '%s/config.cfg' % output_dir
-    run_time, rampup, results_ts_interval, console_logging, progress_bar, results_database, post_run_script, xml_report, user_group_configs = configure(project_name, cmd_opts, config_file=saved_config)
+    run_time, rampup, results_ts_interval, console_logging, progress_bar, results_database, post_run_script, xml_report, user_group_configs, global_config = configure(project_name, cmd_opts, config_file=saved_config)
     print '\n\nanalyzing results...\n'
     results.output_results(output_dir, 'results.csv', run_time, rampup, results_ts_interval, user_group_configs, xml_report)
     print 'created: %sresults.html\n' % output_dir
@@ -202,6 +202,7 @@ def configure(project_name, cmd_opts, config_file=None):
             config_file = '%s/%s/%s' % (cmd_opts.projects_dir, project_name, cmd_opts.config_file)
     config.read(config_file)
     print config_file
+    global_config = dict(config.items('global'))
     for section in config.sections():
         if section == 'global':
             run_time = config.getint(section, 'run_time')
@@ -253,7 +254,7 @@ def configure(project_name, cmd_opts, config_file=None):
             user_group_configs.append(ug_config)
 
     return (run_time, rampup, results_ts_interval, console_logging, progress_bar, results_database,
-            post_run_script, xml_report, user_group_configs)
+            post_run_script, xml_report, user_group_configs, global_config)
 
 
 class UserGroupConfig(object):