Merge lp:~kalebral-deactivatedaccount/drizzle-automation/add-crashme-config-file into lp:drizzle-automation

[Lee Bieber]

[Lee Bieber (kalebral-deactivatedaccount)]

add configuration file for crashme

[Jay Pipes (jaypipes)]

review: Approve

=== added directory 'drizzle/automation/config/crashme'
=== added file 'drizzle/automation/config/crashme/crashme.cnf'
--- drizzle/automation/config/crashme/crashme.cnf	1970-01-01 00:00:00 +0000
+++ drizzle/automation/config/crashme/crashme.cnf	2010-01-13 04:05:22 +0000
@@ -0,0 +1,4 @@
+[run]
+
+# location of the sql bench repository
+sqlbench_home= /home/drizzle/repos/sql-bench

=== modified file 'drizzle/automation/crashme/run.py'
--- drizzle/automation/crashme/run.py	2009-10-27 19:49:11 +0000
+++ drizzle/automation/crashme/run.py	2010-01-13 04:05:22 +0000
@@ -31,6 +31,7 @@
 import os
 import os.path
 from drizzle.automation.lib  import logging
+from drizzle.automation.lib  import util
 import commands
 import datetime
 import time
@@ -64,8 +65,12 @@
   working_dir= variables['working_dir']
   run_date= datetime.datetime.now().isoformat()
   server_name= variables['server']
+  bench_config_name= variables['bench_config_name']
+
   # need the location where the sqlbench repository is located to run the crash-me command
-  sqlbench_home= variables['sqlbench']['sqlbench_home']
+  crashme_config_variables= util.loadConfigFile("crashme", bench_config_name)
+  sqlbench_home= crashme_config_variables['run']['sqlbench_home']
+
   os.chdir(working_dir)
 
   # For BZR mode, the "version" of the server (used in identifying the 

=== modified file 'drizzle/automation/lib/options.py'
--- drizzle/automation/lib/options.py	2010-01-07 20:48:08 +0000
+++ drizzle/automation/lib/options.py	2010-01-13 04:05:22 +0000
@@ -363,10 +363,10 @@
       os.environ['LD_PRELOAD']= variables['ld_preload']
       logging.info("LD_PRELOAD is set to %s\n" % variables['ld_preload'])
 
-    # For dbt2, drizzleslap, sqlbench and sysbench, we require that 
+    # For crashme, dbt2, drizzleslap, sqlbench and sysbench, we require that 
     # a configuration file with options is supplied at runtime...
     command_to_run= variables['command']
-    if command_to_run in ['dbt2','drizzleslap','sqlbench','sysbench']:
+    if command_to_run in ['crashme', 'dbt2','drizzleslap','sqlbench','sysbench']:
       # Check to ensure we have a bench_config value...
       bench_config_name= supplied.bench_config_name
       if bench_config_name is None: