Merge lp:~patrick-crews/percona-server/51-qp-updates into lp:percona-server/5.1

[Patrick Crews]

Updates kewpie to fix issues with crash-me: https://bugs.launchpad.net/kewpie/+bug/901182
We now use --batch-mode so the crash-me run will die / fail on the first problem. I made attempts to interact with the subprocess input / output, but it was problematic...this is a quick, immediate fix : )

Also merges in innodbCrash suite (needs debug build as that is how we control a number of crashes) and various other updates like --test-debug and --randgen-seed options.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2011-12-05 23:11:20 +0000
+++ Makefile	2011-12-23 00:55:24 +0000
@@ -48,30 +48,32 @@
 clean:
 	rm -rf $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1)
 
-test-qp-crashme:
+test-crashme:
 	cd $(KEWPIE) && ./kewpie.py --suite=crashme --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-sqlbench:
+test-sqlbench:
         cd $(KEWPIE) && ./kewpie.py --suite=sqlbench --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-randgen:
+test-randgen:
 	cd $(KEWPIE) && ./kewpie.py --suite=randgen_basic --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-randgen-bugs:
+test-randgen-bugs:
 	cd $(KEWPIE) && ./kewpie.py --suite=randgen_bugs --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-cluster:
+test-cluster:
 	cd $(KEWPIE) && ./kewpie.py --suite=cluster_basic,cluster_randgen --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-cluster-basic:
+test-cluster-basic:
 	cd $(KEWPIE) && ./kewpie.py --suite=cluster_basic --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-cluster-randgen:
+test-cluster-randgen:
 	cd $(KEWPIE) && ./kewpie.py --suite=cluster_randgen --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
-test-qp-cluster-bugs:
+test-cluster-bugs:
 	cd $(KEWPIE) && ./kewpie.py --suite=cluster_bugs --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
+test-innodb-crash:
+	cd $(KEWPIE) && ./kewpie.py --suite=innodbCrash --basedir=$(BASEDIR)/$(PERCONA_SERVER_SHORT_2)
 
 
 

=== modified file 'kewpie/kewpie.py'
--- kewpie/kewpie.py	2011-12-05 18:56:39 +0000
+++ kewpie/kewpie.py	2011-12-23 00:55:24 +0000
@@ -19,16 +19,17 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-""" dbqp.py
+""" kewpie.py
 
-DataBase Quality Platform - system for executing various
+(DataBase) Quality Platform - system for executing various
 testing systems and the helper code 
 
 Designed to be a modular test-runner.  Different testing tools
 and databases may be plugged into the system via hacking the
 appropriate modules
 
-Currently geared towards Drizzle / will expand to MySQL
+Currently geared towards Drizzle and MySQL systems
+Runs: Drizzle, MySQL, Percona Server, Galera dbms's
 """
 
 # imports
@@ -43,9 +44,27 @@
 
 # functions
 
-
 # main
-variables = test_run_options.variables
+# We base / look for a lot of things based on the location of
+# the kewpie.py file
+qp_rootdir = os.path.dirname(os.path.abspath(sys.argv[0]))
+basedir_default = os.path.dirname(qp_rootdir)
+testdir_default = qp_rootdir
+defaults = { 'qp_root':qp_rootdir
+           , 'testdir': qp_rootdir
+           , 'workdir': os.path.join(qp_rootdir,'workdir')
+           , 'clientbindir': os.path.join(os.path.dirname(qp_rootdir),'client')
+           , 'basedir':os.path.dirname(qp_rootdir)
+           , 'server_type':'mysql'
+           , 'valgrind_suppression':os.path.join(qp_rootdir,'valgrind.supp')
+           , 'suitepaths': [ os.path.join(basedir_default,'plugin')
+                           , os.path.join(testdir_default,'suite')
+                           ]
+           , 'randgen_path': os.path.join(qp_rootdir,'randgen')
+           , 'subunit_file': os.path.join(qp_rootdir,'workdir/test_results.subunit')
+           }
+variables = test_run_options.parse_qp_options(defaults)
+variables['qp_root'] = qp_rootdir
 system_manager = None
 server_manager = None
 test_manager = None

=== modified file 'kewpie/lib/modes/native/native_test_management.py'
--- kewpie/lib/modes/native/native_test_management.py	2011-11-12 00:50:21 +0000
+++ kewpie/lib/modes/native/native_test_management.py	2011-12-23 00:55:24 +0000
@@ -118,7 +118,27 @@
                    tests_to_use.append(test)
            testlist = tests_to_use
         for test_case in testlist:
-            self.add_test(self.process_test_file(suite_name, test_case))
+            self.add_test(self.process_test_file( suite_name
+                                                , test_case
+                                                ))
+
+    def get_server_reqs(self, module_file):
+        """ Code to handle extraction of server_requests & requirements
+            from unittest test modules
+
+        """
+
+        module_name = os.path.basename(module_file).replace('.py','')
+        my_module = imp.load_source(module_name, module_file)
+        server_requirements = None
+        server_requests = None
+        try:
+            server_requirements = my_module.server_requirements
+        except AttributeError, NameError: pass
+        try:
+            server_requests = my_module.server_requests
+        except AttributeError, NameError: pass
+        return server_requirements, server_requests
 
 
     def process_test_file(self, suite_name, testfile):
@@ -127,12 +147,8 @@
         # test_name = filename - .py...simpler
         test_name = os.path.basename(testfile).replace('.py','')
         test_comment = None
-        test_module = imp.load_source(test_name, testfile)
-        server_requirements = test_module.server_requirements
-        try:
-            server_requests = test_module.server_requests
-        except AttributeError, NameError:
-            server_requests = None
+        server_requirements, server_requests = self.get_server_reqs(testfile)
+        
         return testCase( self.system_manager
                        , name = test_name
                        , fullname = "%s.%s" %(suite_name, test_name)
@@ -143,7 +159,6 @@
                        , debug = self.debug )
 
 
-
     def record_test_result(self, test_case, test_status, output, exec_time):
         """ Accept the results of an executed testCase for further
             processing.

=== modified file 'kewpie/lib/opts/test_run_options.py'
--- kewpie/lib/opts/test_run_options.py	2011-12-05 23:11:20 +0000
+++ kewpie/lib/opts/test_run_options.py	2011-12-23 00:55:24 +0000
@@ -70,7 +70,9 @@
     if variables['repeat'] <= 0:
         print "Setting --repeat=1.  You chose a silly value that I will ignore :P"
         variables['repeat'] = 1
-    if variables['mode'] == 'randgen' or variables['gendatafile']:
+    # we disable the secure-file-priv option if not using dtr / mtr
+    # this might need to be changed in the future...
+    if variables['mode'] not in ['dtr','mtr']:
         print "Setting --no-secure-file-priv=True for randgen usage..."
         variables['nosecurefilepriv']=True
     if variables['mode'] == 'cleanup':
@@ -94,7 +96,7 @@
         variables['basedir'].append(basedir_default)
     return variables
 
-def handle_user_opts(variables, basedir_default, testdir_default, suitepaths_default):
+def handle_user_opts(variables, defaults):
     """ Some variables are dependent upon default values
         We do the probably hacky thing of going through
         and updating them accordingly
@@ -105,444 +107,455 @@
 
     """
     master_basedir = os.path.abspath(variables['basedir'][0].split(':type:')[0])
-    if master_basedir != basedir_default:
+    if master_basedir != defaults['basedir']:
         new_path = os.path.join(master_basedir, 'plugin')
-        search_path = os.path.join(basedir_default,'plugin')
+        search_path = os.path.join(defaults['basedir'],'plugin')
         tmp = variables['suitepaths']
         tmp[tmp.index(search_path)] = new_path
         variables['suitepaths'] = tmp
-    if variables['testdir'] != testdir_default:
+    if variables['testdir'] != defaults['testdir']:
         new_path = os.path.join(variables['testdir'],'suite')
-        search_path = os.path.join(testdir_default,'suite')
+        search_path = os.path.join(defaults['testdir'],'suite')
         tmp = variables['suitepaths']
         tmp[tmp.index(search_path)] = new_path
         variables['suitepaths'] = tmp
     return variables
 
 
-# Create the CLI option parser
-parser= optparse.OptionParser(version='%prog (database quality platform aka project steve austin) version 0.1.1')
-
-# set some default values
-testdir_default = os.path.abspath(os.getcwd())
-workdir_default = os.path.join(testdir_default,'workdir')
-clientbindir_default = os.path.abspath(os.path.join(testdir_default,'../client'))
-basedir_default = os.path.split(testdir_default)[0]
-server_type_default = 'mysql'
-valgrind_suppression_default = os.path.join(testdir_default,'valgrind.supp')
-suitepaths_default = [ os.path.join(basedir_default,'plugin')
-                     , os.path.join(testdir_default,'suite')
-                     ]
-randgen_path_default = os.path.join(testdir_default,'randgen')
-subunit_file_default = os.path.join(workdir_default,'test_results.subunit')
-
-
-config_control_group = optparse.OptionGroup(parser, 
-                     "Configuration controls - kewpie can read config files with certain options pre-set")
-config_control_group.add_option(
-   "--sys_config_file"
-    , dest="sysconfigfilepath"
-    , action='store'
-    , default=None # We want to have a file that will be our default defaults file...
-    , help="The file that specifies system configuration specs for dbqp to execute tests (not yet implemented)"
-    )
-parser.add_option_group(config_control_group)
-
-
-system_control_group = optparse.OptionGroup(parser, 
-                         "Options for the test-runner itself - defining the system under test and how to execute tests")
-
-system_control_group.add_option(
-      "--force"
-    , dest="force"
-    , action="store_true"
-    , default=False
-    , help="Set this to continue test execution beyond the first failed test"
-    )
-
-system_control_group.add_option(
-       "--start-and-exit"
-     , dest="startandexit"
-     , action="store_true"
-     , default=False
-     , help="Spin up the server(s) for the first specified test then exit (will leave servers running)"
-     )
-
-system_control_group.add_option(
-       "--verbose"
-     , dest="verbose"
-     , action="store_true"
-     , default = False
-     , help="Produces extensive output about test-runner state.  Distinct from --debug"
-     )
-   
-system_control_group.add_option(
-       "--debug"
-     , dest="debug"
-     , action="store_true"
-     , default = False
-     , help="Provide internal-level debugging output.  Distinct from --verbose"
-     )
-
-system_control_group.add_option(
-       "--mode"
-     , dest="mode"
-     , default="native"
-     , help="Testing mode.  We currently support dtr, randgen, sysbench, sqlbench, crashme and cleanup modes.  See docs for further details about individual modes [%default]"
-     )
-
-system_control_group.add_option(
-       "--record"
-     , dest="record"
-     , action="store_true"
-     , default=False
-     , help="Record a testcase result (if the testing mode supports it) [%default]"
-     )
-
-system_control_group.add_option(
-       "--fast"
-     , dest="fast"
-     , action="store_true"
-     , default=False
-     , help="Don't try to cleanup from earlier runs (currently just a placeholder) [%default]"
-     )
-   
-parser.add_option_group(system_control_group)
-
-test_control_group = optparse.OptionGroup(parser, 
-                         "Options for controlling which tests are executed")
-
-test_control_group.add_option(
-    "--suite"
-  , dest="suitelist"
-  , type='string'
-  , action="callback"
-  , callback=comma_list_split
-  , help="The name of the suite containing tests we want. Can accept comma-separated list (with no spaces).  Additional --suite args are appended to existing list     [autosearch]"
-  )
-
-test_control_group.add_option(
-    "--suitepath"
-  , dest="suitepaths"
-  , type='string'
-  , action="append"
-  , default = suitepaths_default
-  , help="The path containing the suite(s) you wish to execute.  Use one --suitepath for each suite you want to use. [%default]"
-  )
-
-test_control_group.add_option(
-    "--do-test"
-  , dest="dotest"
-  , type='string'
-  , default = None
-  , help="input can either be a prefix or a regex. Will only execute tests that match the provided pattern"
-  )
-
-test_control_group.add_option(
-    "--skip-test"
-  , dest="skiptest"
-  , type='string'
-  , default = None
-  , help = "input can either be a prefix or a regex.  Will exclude tests that match the provided pattern"
-  )
-
-test_control_group.add_option(
-    "--reorder"
-  , dest="reorder"
-  , action="store_true"
-  , default=False
-  , help = "sort the testcases so that they are executed optimally for the given mode [%default]"
-  )
-
-test_control_group.add_option(
-    "--repeat"
-  , dest="repeat"
-  , type='int'
-  , action="store"
-  , default=1
-  , help = "Run each test case the specified number of times.  For a given sequence, the first test will be run n times, then the second, etc [%default]"
-  )
-
-parser.add_option_group(test_control_group)
-
-# test subject control group
-# terrible name for options tht define the server / code
-# that is under test
-
-# find some default values
-# assume we are in-tree testing in general and operating from root/test(?)
-testdir_default = os.path.abspath(os.getcwd())
-
-basedir_default = os.path.split(testdir_default)[0]
-
-test_subject_control_group = optparse.OptionGroup(parser,
-                                 "Options for defining the code that will be under test")
-
-test_subject_control_group.add_option(
-    "--basedir"
-  , dest="basedir"
-  , type='string'
-  , default = []
-  , action="append"
-  , help = "Pass this argument to signal to the test-runner that this is an in-tree test.  We automatically set a number of variables relative to the argument (client-bindir, serverdir, testdir) [%basedir_default]"
-  )
-
-test_subject_control_group.add_option(
-    "--default-server-type"
-  , dest="defaultservertype"
-  , type='string'
-  , default = server_type_default
-  , action='store'
-  , help = "Defines what we consider to be the default server type.  We assume a server is default type unless specified otherwise. [%default]"
-  )
-
-test_subject_control_group.add_option(
-    "--serverdir"
-  , dest="serverpath"
-  , type='string'
-  , action="callback"
-  , callback=get_abspath
-  , help = "Path to the server executable.  [%default]"
-  )
-
-test_subject_control_group.add_option(
-    "--client-bindir"
-  , dest="clientbindir"
-  , type = 'string'
-  , action="callback"
-  , callback=get_abspath
-  , help = "Path to the directory containing client program binaries for use in testing [%default]"
-  )
-
-
-test_subject_control_group.add_option(
-    "--default-storage-engine"
-   , dest="defaultengine"
-   , default = 'innodb'
-   , help="Start drizzled using the specified engine [%default]"
-   )    
-
-
-parser.add_option_group(test_subject_control_group)
-# end test subject control group
-
-# environment options
-
-environment_control_group = optparse.OptionGroup(parser, 
-                            "Options for defining the testing environment")
-
-environment_control_group.add_option(
-    "--testdir"
-  , dest="testdir"
-  , type = 'string'
-  , default = testdir_default
-  , action="callback"
-  , callback=get_abspath
-  , help = "Path to the test dir, containing additional files for test execution. [%default]"
-  )
-
-environment_control_group.add_option(
-    "--workdir"
-  , dest="workdir"
-  , type='string'
-  , default = workdir_default
-  , action="callback"
-  , callback=get_abspath
-  , help = "Path to the directory test-run will use to store generated files and directories. [%default]"
-  )
-
-environment_control_group.add_option(
-    "--top-srcdir"
-  , dest="topsrcdir"
-  , type='string'
-  , default = basedir_default
-  , help = "build option [%default]"
-  )
-
-environment_control_group.add_option(
-    "--top-builddir"
-  , dest="topbuilddir"
-  , type='string'
-  , default = basedir_default
-  , help = "build option [%default]"
-  )
-
-environment_control_group.add_option(
-    "--no-shm"
-  , dest="noshm"
-  , action='store_true'
-  , default=False
-  , help = "By default, we symlink workdir to a location in shm.  Use this flag to not symlink [%default]"
-  )
-
-environment_control_group.add_option(
-    "--libeatmydata"
-  , dest="libeatmydata"
-  , action='store_true'
-  , default=False
-  , help = "We use libeatmydata (if available) to disable fsyncs and speed up test execution.  Implies --no-shm"
-  )
-
-environment_control_group.add_option(
-    "--libeatmydata-path"
-  , dest="libeatmydatapath"
-  , action='store'
-  , default='/usr/local/lib/libeatmydata.so'
-  , help = "Path to the libeatmydata install you want to use [%default]"
-  )
-
-environment_control_group.add_option(
-    "--start-dirty"
-  , dest="startdirty"
-  , action='store_true'
-  , default=False
-  , help = "Don't try to clean up working directories before test execution [%default]"
-  )
-
-environment_control_group.add_option(
-    "--no-secure-file-priv"
-  , dest = "nosecurefilepriv"
-  , action='store_true'
-  , default=False
-  , help = "Turn off the use of --secure-file-priv=vardir for started servers"
-  )
-
-environment_control_group.add_option(
-       "--randgen-path"
-     , dest="randgenpath"
-     , action='store'
-     , default=randgen_path_default
-     , help = "The path to a randgen installation that can be used to execute randgen-based tests [%default]"
-     )
-
-environment_control_group.add_option(
-       "--innobackupex-path"
-     , dest="innobackupexpath"
-     , action='store'
-     , default=None
-     , help = "The path to the innobackupex script that facilitates the use of Xtrabackup"
-     )
-
-environment_control_group.add_option(
-      "--xtrabackup-path"
-    , dest="xtrabackuppath"
-    , action='store'
-    , default=None
-    , help = "The path the xtrabackup binary to be tested"
-    )
-
-environment_control_group.add_option(
-      "--wsrep-provider-path"
-   , dest="wsrepprovider"
-   , action='store'
-   , default=None
-   , help = "The path to a wsrep provider library for use with mysql"
-   )
-
-environment_control_group.add_option(
-      "--subunit-outfile"
-    , dest="subunitoutfile"
-    , action='store'
-    , default=subunit_file_default
-    , help = "File path where subunit output will be logged [%default]"
-    )
-
-parser.add_option_group(environment_control_group)
-# end environment control group
-
-option_passing_group = optparse.OptionGroup(parser,
-                      "Options to pass options on to the server")
-
-option_passing_group.add_option(
-"--drizzled"
-  , dest="drizzledoptions"
-  , type='string'
-  , action='append' 
-  , default = []
-  , help = "Pass additional options to the server.  Will be passed to all servers for all tests (mostly for --start-and-exit)"
-  )
-
-parser.add_option_group(option_passing_group)
-# end option passing group
-
-analysis_control_group = optparse.OptionGroup(parser, 
-                            "Options for defining the tools we use for code analysis (valgrind, gprof, gcov, etc)")
-
-analysis_control_group.add_option(
-    "--valgrind"
-  , dest="valgrind"
-  , action='store_true'
-  , default = False
-  , help = "Run drizzletest and drizzled executables using valgrind with default options [%default]"
-  )
-
-analysis_control_group.add_option(
-    "--valgrind-option"
-  , dest="valgrindarglist"
-  , type='string'
-  , action="append"
-  , help = "Pass an option to valgrind (overrides/removes default valgrind options)"
-  )
-
-analysis_control_group.add_option(
-    "--valgrind-suppressions"
-  , dest="valgrindsuppressions"
-  , type='string'
-  , action='store'
-  , default = valgrind_suppression_default
-  , help = "Point at a valgrind suppression file [%default]"
-  )
-
-analysis_control_group.add_option(
-    "--helgrind"
-  , dest="helgrind"
-  , action='store_true'
-  , default=False
-  , help="Use the helgrind tool for valgrind.  Implies / will auto-use --valgrind"
-  )
-
-parser.add_option_group(analysis_control_group)
-
-debugger_control_group = optparse.OptionGroup(parser,
-                           "Options for controlling the use of debuggers with test execution")
-
-debugger_control_group.add_option(
-    "--gdb"
-  , dest="gdb"
-  , action='store_true'
-  , default=False
-  , help="Start the drizzled server(s) in gdb"
-  )
-
-debugger_control_group.add_option(
-    "--manual-gdb"
-  , dest="manualgdb"
-  , action='store_true'
-  , default=False
-  , help="Allows you to start the drizzled server(s) in gdb manually (in another window, etc)"
-  )
-
-parser.add_option_group(debugger_control_group)
-
-utility_group = optparse.OptionGroup(parser,
-                  "Options to call additional utilities such as datagen")
-
-utility_group.add_option(
-    "--gendata"
-  , dest="gendatafile"
-  , action='store'
-  , type='string'
-  , default=None
-  , help="Call the randgen's gendata utility to use the specified configuration file.  This will populate the server prior to any test execution")
-
-parser.add_option_group(utility_group)
-
-# supplied will be those arguments matching an option, 
-# and test_cases will be everything else
-(args, test_cases)= parser.parse_args()
-
-variables = {}
-variables = organize_options(args, test_cases)
-variables = populate_defaults(variables, basedir_default)
-variables = handle_user_opts(variables, basedir_default, testdir_default, suitepaths_default)
-
+
+def parse_qp_options(defaults):
+    """ We parse our options and do our magic based on some default values """
+    # Create the CLI option parser
+    parser= optparse.OptionParser(version='%prog (database quality platform aka project steve austin) version 0.1.1')
+    config_control_group = optparse.OptionGroup(parser, 
+                         "Configuration controls - allows you to specify a file with a number of options already specified")
+    config_control_group.add_option(
+       "--sys_config_file"
+        , dest="sysconfigfilepath"
+        , action='store'
+        , default=None # We want to have a file that will be our default defaults file...
+        , help="The file that specifies system configuration specs for dbqp to execute tests (not yet implemented)"
+        )
+    parser.add_option_group(config_control_group)
+
+
+    system_control_group = optparse.OptionGroup(parser, 
+                             "Options for the test-runner itself - defining the system under test and how to execute tests")
+
+    system_control_group.add_option(
+          "--force"
+        , dest="force"
+        , action="store_true"
+        , default=False
+        , help="Set this to continue test execution beyond the first failed test"
+        )
+
+    system_control_group.add_option(
+           "--start-and-exit"
+         , dest="startandexit"
+         , action="store_true"
+         , default=False
+         , help="Spin up the server(s) for the first specified test then exit (will leave servers running)"
+         )
+
+    system_control_group.add_option(
+           "--verbose"
+         , dest="verbose"
+         , action="store_true"
+         , default = False
+         , help="Produces extensive output about test-runner state.  Distinct from --debug"
+         )
+   
+    system_control_group.add_option(
+           "--debug"
+         , dest="debug"
+         , action="store_true"
+         , default = False
+         , help="Provide internal-level debugging output.  Distinct from --verbose"
+         )
+
+    system_control_group.add_option(
+           "--mode"
+         , dest="mode"
+         , default="native"
+         , help="Testing mode.  We currently support dtr, randgen, sysbench, sqlbench, crashme and cleanup modes.  See docs for further details about individual modes [%default]"
+         )
+
+    system_control_group.add_option(
+           "--record"
+         , dest="record"
+         , action="store_true"
+         , default=False
+         , help="Record a testcase result (if the testing mode supports it) [%default]"
+         )
+
+    system_control_group.add_option(
+           "--fast"
+         , dest="fast"
+         , action="store_true"
+         , default=False
+         , help="Don't try to cleanup from earlier runs (currently just a placeholder) [%default]"
+         )
+   
+    parser.add_option_group(system_control_group)
+
+    test_exec_control_group = optparse.OptionGroup(parser,
+                                       "Options for controlling how tests are executed")
+
+    test_exec_control_group.add_option(
+        "--test-debug"
+      , dest="testdebug"
+      , action="store_true"
+      , default=False
+      , help="Toggle to control any debugging / helper output with unittest test cases [%default]"
+      )
+
+    test_exec_control_group.add_option(
+        "--randgen-seed"
+      , dest="randgenseed"
+      , type='string'
+      , action="store"
+      , default='1'
+      , help="Alter the seed value provided to the random query generator to vary test runs. (string) [%default]"
+      )
+
+    parser.add_option_group(test_exec_control_group)
+
+    test_control_group = optparse.OptionGroup(parser, 
+                             "Options for controlling which tests are executed")
+
+    test_control_group.add_option(
+        "--suite"
+      , dest="suitelist"
+      , type='string'
+      , action="callback"
+      , callback=comma_list_split
+      , help="The name of the suite containing tests we want. Can accept comma-separated list (with no spaces).  Additional --suite args are appended to existing list     [autosearch]"
+      )
+
+    test_control_group.add_option(
+        "--suitepath"
+      , dest="suitepaths"
+      , type='string'
+      , action="append"
+      , default = defaults['suitepaths']
+      , help="The path containing the suite(s) you wish to execute.  Use one --suitepath for each suite you want to use. [%default]"
+      )
+
+    test_control_group.add_option(
+        "--do-test"
+      , dest="dotest"
+      , type='string'
+      , default = None
+      , help="input can either be a prefix or a regex. Will only execute tests that match the provided pattern"
+      )
+
+    test_control_group.add_option(
+        "--skip-test"
+      , dest="skiptest"
+      , type='string'
+      , default = None
+      , help = "input can either be a prefix or a regex.  Will exclude tests that match the provided pattern"
+      )
+
+    test_control_group.add_option(
+        "--reorder"
+      , dest="reorder"
+      , action="store_true"
+      , default=False
+      , help = "sort the testcases so that they are executed optimally for the given mode [%default]"
+      )
+
+    test_control_group.add_option(
+        "--repeat"
+      , dest="repeat"
+      , type='int'
+      , action="store"
+      , default=1
+      , help = "Run each test case the specified number of times.  For a given sequence, the first test will be run n times, then the second, etc [%default]"
+      )
+
+    parser.add_option_group(test_control_group)
+
+    # test subject control group
+    # terrible name for options tht define the server / code
+    # that is under test
+    test_subject_control_group = optparse.OptionGroup(parser,
+                                     "Options for defining the code that will be under test")
+
+    test_subject_control_group.add_option(
+        "--basedir"
+      , dest="basedir"
+      , type='string'
+      , default = []
+      , action="append"
+      , help = "Pass this argument to signal to the test-runner that this is an in-tree test.  We automatically set a number of variables relative to the argument (client-bindir, serverdir, testdir) [%defaults['basedir']]"
+      )
+
+    test_subject_control_group.add_option(
+        "--default-server-type"
+      , dest="defaultservertype"
+      , type='string'
+      , default = defaults['server_type']
+      , action='store'
+      , help = "Defines what we consider to be the default server type.  We assume a server is default type unless specified otherwise. [%default]"
+      )
+
+    test_subject_control_group.add_option(
+        "--serverdir"
+      , dest="serverpath"
+      , type='string'
+      , action="callback"
+      , callback=get_abspath
+      , help = "Path to the server executable.  [%default]"
+      )
+
+    test_subject_control_group.add_option(
+        "--client-bindir"
+      , dest="clientbindir"
+      , type = 'string'
+      , action="callback"
+      , callback=get_abspath
+      , help = "Path to the directory containing client program binaries for use in testing [%default]"
+      )
+
+
+    test_subject_control_group.add_option(
+        "--default-storage-engine"
+       , dest="defaultengine"
+       , default = 'innodb'
+       , help="Start drizzled using the specified engine [%default]"
+       )
+
+
+    parser.add_option_group(test_subject_control_group)
+    # end test subject control group
+
+    # environment options
+
+    environment_control_group = optparse.OptionGroup(parser, 
+                                "Options for defining the testing environment")
+
+    environment_control_group.add_option(
+        "--testdir"
+      , dest="testdir"
+      , type = 'string'
+      , default = defaults['testdir']
+      , action="callback"
+      , callback=get_abspath
+      , help = "Path to the test dir, containing additional files for test execution. [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--workdir"
+      , dest="workdir"
+      , type='string'
+      , default = defaults['workdir']
+      , action="callback"
+      , callback=get_abspath
+      , help = "Path to the directory test-run will use to store generated files and directories. [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--top-srcdir"
+      , dest="topsrcdir"
+      , type='string'
+      , default = defaults['basedir']
+      , help = "build option [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--top-builddir"
+      , dest="topbuilddir"
+      , type='string'
+      , default = defaults['basedir']
+      , help = "build option [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--no-shm"
+      , dest="noshm"
+      , action='store_true'
+      , default=False
+      , help = "By default, we symlink workdir to a location in shm.  Use this flag to not symlink [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--libeatmydata"
+      , dest="libeatmydata"
+      , action='store_true'
+      , default=False
+      , help = "We use libeatmydata (if available) to disable fsyncs and speed up test execution.  Implies --no-shm"
+      )
+
+    environment_control_group.add_option(
+        "--libeatmydata-path"
+      , dest="libeatmydatapath"
+      , action='store'
+      , default='/usr/local/lib/libeatmydata.so'
+      , help = "Path to the libeatmydata install you want to use [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--start-dirty"
+      , dest="startdirty"
+      , action='store_true'
+      , default=False
+      , help = "Don't try to clean up working directories before test execution [%default]"
+      )
+
+    environment_control_group.add_option(
+        "--no-secure-file-priv"
+      , dest = "nosecurefilepriv"
+      , action='store_true'
+      , default=False
+      , help = "Turn off the use of --secure-file-priv=vardir for started servers"
+      )
+
+    environment_control_group.add_option(
+           "--randgen-path"
+         , dest="randgenpath"
+         , action='store'
+         , default=defaults['randgen_path']
+         , help = "The path to a randgen installation that can be used to execute randgen-based tests"
+         )
+
+    environment_control_group.add_option(
+           "--innobackupex-path"
+         , dest="innobackupexpath"
+         , action='store'
+         , default=None
+         , help = "The path to the innobackupex script that facilitates the use of Xtrabackup"
+         )
+
+    environment_control_group.add_option(
+          "--xtrabackup-path"
+        , dest="xtrabackuppath"
+        , action='store'
+        , default=None
+        , help = "The path the xtrabackup binary to be tested"
+        )
+
+    environment_control_group.add_option(
+          "--wsrep-provider-path"
+       , dest="wsrepprovider"
+       , action='store'
+       , default=None
+       , help = "The path to a wsrep provider library for use with mysql"
+       )
+
+    environment_control_group.add_option(
+          "--cluster-cnf"
+        , dest="clustercnf"
+        , action='store'
+        , default=None
+        , help = "The path to a config file defining a running cluster (node info)"
+        )
+
+    environment_control_group.add_option(
+          "--subunit-outfile"
+        , dest="subunitoutfile"
+        , action='store'
+        , default=defaults['subunit_file']
+        , help = "File path where subunit output will be logged [%default]"
+        )
+
+    parser.add_option_group(environment_control_group)
+    # end environment control group
+
+    option_passing_group = optparse.OptionGroup(parser,
+                          "Options to pass options on to the server")
+
+    option_passing_group.add_option(
+    "--drizzled"
+      , dest="drizzledoptions"
+      , type='string'
+      , action='append' 
+      , default = []
+      , help = "Pass additional options to the server.  Will be passed to all servers for all tests (mostly for --start-and-exit)"
+      )
+
+    parser.add_option_group(option_passing_group)
+    # end option passing group
+
+    analysis_control_group = optparse.OptionGroup(parser, 
+                                "Options for defining the tools we use for code analysis (valgrind, gprof, gcov, etc)")
+
+    analysis_control_group.add_option(
+        "--valgrind"
+      , dest="valgrind"
+      , action='store_true'
+      , default = False
+      , help = "Run drizzletest and drizzled executables using valgrind with default options [%default]"
+      )
+
+    analysis_control_group.add_option(
+        "--valgrind-option"
+      , dest="valgrindarglist"
+      , type='string'
+      , action="append"
+      , help = "Pass an option to valgrind (overrides/removes default valgrind options)"
+      )
+
+    analysis_control_group.add_option(
+        "--valgrind-suppressions"
+      , dest="valgrindsuppressions"
+      , type='string'
+      , action='store'
+      , default = defaults['valgrind_suppression']
+      , help = "Point at a valgrind suppression file [%default]"
+      )
+
+    analysis_control_group.add_option(
+        "--helgrind"
+      , dest="helgrind"
+      , action='store_true'
+      , default=False
+      , help="Use the helgrind tool for valgrind.  Implies / will auto-use --valgrind"
+      )
+
+    parser.add_option_group(analysis_control_group)
+
+    debugger_control_group = optparse.OptionGroup(parser,
+                               "Options for controlling the use of debuggers with test execution")
+
+    debugger_control_group.add_option(
+        "--gdb"
+      , dest="gdb"
+      , action='store_true'
+      , default=False
+      , help="Start the drizzled server(s) in gdb"
+      )
+
+    debugger_control_group.add_option(
+        "--manual-gdb"
+      , dest="manualgdb"
+      , action='store_true'
+      , default=False
+      , help="Allows you to start the drizzled server(s) in gdb manually (in another window, etc)"
+      )
+
+    parser.add_option_group(debugger_control_group)
+
+    utility_group = optparse.OptionGroup(parser,
+                      "Options to call additional utilities such as datagen")
+
+    utility_group.add_option(
+        "--gendata"
+      , dest="gendatafile"
+      , action='store'
+      , type='string'
+      , default=None
+      , help="Call the randgen's gendata utility to use the specified configuration file.  This will populate the server prior to any test execution")
+
+    parser.add_option_group(utility_group)
+
+    # supplied will be those arguments matching an option, 
+    # and test_cases will be everything else
+    (args, test_cases)= parser.parse_args()
+
+    variables = {}
+    variables = organize_options(args, test_cases)
+    variables = populate_defaults(variables, defaults['basedir'])
+    variables = handle_user_opts(variables, defaults)
+    return variables

=== modified file 'kewpie/lib/server_mgmt/drizzled.py'
--- kewpie/lib/server_mgmt/drizzled.py	2011-12-01 00:14:08 +0000
+++ kewpie/lib/server_mgmt/drizzled.py	2011-12-23 00:55:24 +0000
@@ -93,9 +93,17 @@
         self.logdir = os.path.join(self.vardir,'log')
         self.datadir = os.path.join(self.vardir,'master-data')
 
-        self.error_log = os.path.join(self.logdir,('%s.err' %(self.name)))
+        self.error_log = os.path.join(self.logdir,'error.log')
         self.pid_file = os.path.join(self.rundir,('%s.pid' %(self.name)))
         self.socket_file = os.path.join(self.vardir, ('%s.sock' %(self.name)))
+        if len(self.socket_file) > 107:
+            # MySQL has a limitation of 107 characters for socket file path
+            # we copy the mtr workaround of creating one in /tmp
+            self.logging.verbose("Default socket file path: %s" %(self.socket_file))
+            self.socket_file = "/tmp/%s_%s.%s.sock" %(self.system_manager.uuid
+                                                    ,self.owner
+                                                    ,self.name)
+            self.logging.verbose("Changing to alternate: %s" %(self.socket_file))
         self.timer_file = os.path.join(self.logdir,('timer'))
 
         # Do magic to create a config file for use with the slave

=== modified file 'kewpie/lib/server_mgmt/galera.py'
--- kewpie/lib/server_mgmt/galera.py	2011-12-01 01:59:54 +0000
+++ kewpie/lib/server_mgmt/galera.py	2011-12-23 00:55:24 +0000
@@ -109,6 +109,15 @@
         self.bootstrap_log = os.path.join(self.logdir,('bootstrap.log'))
         self.pid_file = os.path.join(self.rundir,('my.pid'))
         self.socket_file = os.path.join(self.vardir, ('my.sock'))
+        if len(self.socket_file) > 107:
+            # MySQL has a limitation of 107 characters for socket file path
+            # we copy the mtr workaround of creating one in /tmp
+            self.logging.verbose("Default socket file path: %s" %(self.socket_file))
+            self.socket_file = "/tmp/%s_%s.%s.sock" %(self.system_manager.uuid
+                                                    ,self.owner
+                                                    ,self.name)
+            self.logging.verbose("Changing to alternate: %s" %(self.socket_file))
+
         self.timer_file = os.path.join(self.logdir,('timer'))
         self.general_log_file = os.path.join(self.logdir,'mysqld.log')
         self.slow_query_log_file = os.path.join(self.logdir,'mysqld-slow.log')

=== modified file 'kewpie/lib/server_mgmt/mysqld.py'
--- kewpie/lib/server_mgmt/mysqld.py	2011-12-05 23:11:20 +0000
+++ kewpie/lib/server_mgmt/mysqld.py	2011-12-23 00:55:24 +0000
@@ -78,10 +78,10 @@
         self.bootstrap_file = self.code_tree.bootstrap_path
         self.bootstrap_cmd = None
 
-        # MySQL 5.1 servers use --language argument vs. lc-message-dir
+        # MySQL 5.0 and 5.1 servers use --language argument vs. lc-message-dir
         # We check and set things appropriately for such cases
         self.langstring = "--lc-messages-dir=%s" %(self.langdir)
-        if self.version.startswith('5.1'):
+        if self.version.startswith('5.1') or self.version.startswith('5.0'):
             self.langstring = "--language=%s" %(os.path.join(self.langdir
                                                             ,'english')
                                                )
@@ -115,6 +115,14 @@
         self.bootstrap_log = os.path.join(self.logdir,('bootstrap.log'))
         self.pid_file = os.path.join(self.rundir,('%s.pid' %(self.name)))
         self.socket_file = os.path.join(self.vardir, ('%s.sock' %(self.name)))
+        if len(self.socket_file) > 107:
+            # MySQL has a limitation of 107 characters for socket file path
+            # we copy the mtr workaround of creating one in /tmp
+            self.logging.verbose("Default socket file path: %s" %(self.socket_file))
+            self.socket_file = "/tmp/%s_%s.%s.sock" %(self.system_manager.uuid
+                                                    ,self.owner
+                                                    ,self.name)
+            self.logging.verbose("Changing to alternate: %s" %(self.socket_file))
         self.timer_file = os.path.join(self.logdir,('timer'))
         self.general_log_file = os.path.join(self.logdir,'mysqld.log')
         self.slow_query_log_file = os.path.join(self.logdir,'mysqld-slow.log')
@@ -225,12 +233,7 @@
                       , "--loose-performance-schema-max-rwlock-instances=10000"
                       , "--loose-performance-schema-max-table-instances=500"
                       , "--loose-performance-schema-max-table-handles=1000"
-                      , "--binlog-direct-non-transactional-updates"
                       , "--loose-enable-performance-schema"
-                      , "--general_log=1"
-                      , "--general_log_file=%s" %(self.general_log_file)
-                      , "--slow_query_log=1"
-                      , "--slow_query_log_file=%s" %(self.slow_query_log_file)
                       , "--basedir=%s" %(self.code_tree.basedir)
                       , "--datadir=%s" %(self.datadir)
                       , "--tmpdir=%s"  %(self.tmpdir)
@@ -249,6 +252,14 @@
                       , self.secure_file_string
                       , self.user_string
                       ]
+
+        if not self.version.startswith('5.0'):
+            server_args += [ "--binlog-direct-non-transactional-updates"
+                           , "--general_log=1"
+                           , "--general_log_file=%s" %(self.general_log_file)
+                           , "--slow_query_log=1"
+                           , "--slow_query_log_file=%s" %(self.slow_query_log_file)
+                           ]
         self.gen_cnf_file(server_args)
 
         if self.gdb:
@@ -314,9 +325,12 @@
         msg = None
         if self.status:  # we are running and can do things!
             # Get master binlog info
-            master_binlog_file, master_binlog_pos = master_server.get_binlog_info()
-            if not get_cur_log_pos:
-                master_binlog_pos = 0
+            retcode, master_binlog_file, master_binlog_pos = master_server.get_binlog_info()
+            if not retcode:
+                if not get_cur_log_pos:
+                    master_binlog_pos = 0
+            else:
+                return retcode, master_binlog_file #contains error msg on failure
             
             # update our slave's master info
             query = ("CHANGE MASTER TO "
@@ -356,11 +370,117 @@
             self.master = master_server
         return 0,msg
 
+    def get_slave_status(self):
+        query = "SHOW SLAVE STATUS"
+        retcode, result_set = execute_query(query, self)
+        result_set = result_set[0]
+        if not retcode:
+            slave_data = { 'slave_io_state':result_set[0]
+                         , 'master_host':result_set[1]
+                         , 'master_user':result_set[2]
+                         , 'master_port':result_set[3]
+                         , 'connect_retry':result_set[4]
+                         , 'master_log_file':result_set[5]
+                         , 'read_master_log_pos':result_set[6]
+                         , 'relay_log_file':result_set[7]
+                         , 'relay_log_pos':result_set[8]
+                         , 'relay_master_log_file':result_set[9]
+                         , 'slave_io_running':result_set[10]
+                         , 'slave_sql_running':result_set[11]
+                         , 'replicate_do_db':result_set[12]
+                         , 'replicate_ignore_db':result_set[13]
+                         , 'replicate_do_table':result_set[14]
+                         , 'replicate_ignore_table':result_set[15]
+                         , 'replicate_wild_do_table':result_set[16]
+                         , 'replicate_wild_ignore_table':result_set[17]
+                         , 'last_errno':result_set[18]
+                         , 'last_error':result_set[19]
+                         , 'skip_counter':result_set[20]
+                         , 'exec_master_log_pos':result_set[21]
+                         , 'relay_log_space':result_set[22]
+                         , 'until_condition':result_set[23]
+                         , 'until_log_file':result_set[24]
+                         , 'until_log_pos':result_set[25]
+                         , 'master_ssl_allowed':result_set[26]
+                         , 'master_ssl_ca_file':result_set[27]
+                         , 'master_ssl_ca_path':result_set[28]
+                         , 'master_ssl_cert':result_set[29]
+                         , 'master_ssl_cipher':result_set[30]
+                         , 'master_ssl_key':result_set[31]
+                         , 'seconds_behind_master':result_set[32]
+                         , 'master_ssl_verify_server_cert':result_set[33]
+                         , 'last_io_errno':result_set[34]
+                         , 'last_io_error':result_set[35]
+                         , 'last_sql_errno':result_set[36]
+                         , 'last_sql_error':result_set[37]
+                         , 'replicate_ignore_server_ids':result_set[38]
+                         }
+            return slave_data
+        else:
+            print result_set
+            return None
+     
+         
     def get_binlog_info(self):
         """ We try to get binlog information for the server """
         query = "SHOW MASTER STATUS"
         retcode, result_set = execute_query(query, self)
-        binlog_file = result_set[0][0]
-        binlog_pos = result_set[0][1]
-        return binlog_file, binlog_pos
-
+        if not retcode:
+            binlog_file = result_set[0][0]
+            binlog_pos = result_set[0][1]
+        else:
+            binlog_file = result_set
+            binlog_pos = result_set
+        return retcode, binlog_file, binlog_pos
+
+    def slave_stop(self):
+        """ We issue STOP SLAVE and wait for IO and SQL threads to stop """
+        
+        query = "STOP SLAVE"
+        retcode, result = execute_query(query, self)
+        slave_status = self.get_slave_status()
+        while slave_status['slave_io_running'] == 'Yes' or slave_status['slave_sql_running'] == 'Yes': 
+            slave_status = self.get_slave_status()
+
+    def slave_start(self):
+        """ We issue START SLAVE and wait for IO and SQL threads to start """
+        query = "START SLAVE"
+        retcode, result = execute_query(query, self)
+        slave_status = self.get_slave_status()
+        while slave_status['slave_io_running'] == 'No' or slave_status['slave_sql_running'] == 'No':
+            slave_status = self.get_slave_status()
+
+
+    def wait_sync_with_slaves(self, slave_list, timeout=60):
+        """ We scan through our slave list and make sure we are synched up
+            before moving on with the test
+
+        """
+
+        retcode, master_binlog_file, master_binlog_pos = self.get_binlog_info()
+        while slave_list:
+            for idx, slave_server in enumerate(slave_list):
+                slave_status_data = slave_server.get_slave_status()
+                read_master_log_pos = slave_status_data['read_master_log_pos']
+                exec_master_log_pos = slave_status_data['exec_master_log_pos']
+                seconds_behind_master = slave_status_data['seconds_behind_master']
+                slave_io_state = slave_status_data['slave_io_state']
+                # This test subject to change as I learn more ; )
+                #if master_binlog_pos == exec_master_log_pos:
+                if exec_master_log_pos == read_master_log_pos and slave_io_state == 'Waiting for master to send event':
+                    #print 'Server: %s.%s' %(self.owner, self.name)
+                    #print 'Master_binlog_file: %s' %master_binlog_file
+                    #print 'Master_binlog_pos: %s' %master_binlog_pos
+                    #print 'Exec_master_log_pos: %s' %exec_master_log_pos
+                    #print 'Read_master_log_pos: %s' %read_master_log_pos
+                    #if read_master_log_pos > master_binlog_pos:
+                    #for key, item in slave_status_data.items():
+                    #        print "%s:%s" %(key, item)
+                    #print '#'*80
+                    # It is normally a no-no to remove items from a list
+                    # mid-iteration, but this is a chance to break that rule
+                    # >: )
+                    slave_list.pop(idx)
+                            
+
+ 

=== modified file 'kewpie/lib/server_mgmt/percona.py'
--- kewpie/lib/server_mgmt/percona.py	2011-12-01 00:14:08 +0000
+++ kewpie/lib/server_mgmt/percona.py	2011-12-23 00:55:24 +0000
@@ -103,6 +103,14 @@
         self.bootstrap_log = os.path.join(self.logdir,('bootstrap.log'))
         self.pid_file = os.path.join(self.rundir,('%s.pid' %(self.name)))
         self.socket_file = os.path.join(self.vardir, ('%s.sock' %(self.name)))
+        if len(self.socket_file) > 107:
+            # MySQL has a limitation of 107 characters for socket file path
+            # we copy the mtr workaround of creating one in /tmp
+            self.logging.verbose("Default socket file path: %s" %(self.socket_file))
+            self.socket_file = "/tmp/%s_%s.%s.sock" %(self.system_manager.uuid
+                                                    ,self.owner
+                                                    ,self.name)
+            self.logging.verbose("Changing to alternate: %s" %(self.socket_file))
         self.timer_file = os.path.join(self.logdir,('timer'))
         self.general_log_file = os.path.join(self.logdir,'mysqld.log')
         self.slow_query_log_file = os.path.join(self.logdir,'mysqld-slow.log')

=== modified file 'kewpie/lib/sys_mgmt/system_management.py'
--- kewpie/lib/sys_mgmt/system_management.py	2011-12-05 21:23:04 +0000
+++ kewpie/lib/sys_mgmt/system_management.py	2011-12-23 00:55:24 +0000
@@ -58,7 +58,7 @@
             self.logging.verbose("Initializing system manager...")
 
         self.skip_keys = [ 'port_manager'
-                         , 'logging_manager'
+                         , 'logging'
                          , 'code_manager'
                          , 'env_manager'
                          , 'environment_reqs'
@@ -69,9 +69,10 @@
         self.shm_path = self.find_path(["/dev/shm", "/tmp"], required=0)
         self.cur_os = os.uname()[0]
         self.cur_user = getpass.getuser()
+        self.rootdir = variables['qp_root']
         self.workdir = os.path.abspath(variables['workdir'])
         self.testdir = os.path.abspath(variables['testdir'])
-        self.datadir = os.path.abspath(os.path.join(variables['testdir'],'qp_data'))
+        self.datadir = os.path.join(self.rootdir,'qp_data')
         self.top_srcdir = os.path.abspath(variables['topsrcdir'])
         self.top_builddir = os.path.abspath(variables['topbuilddir'])
         self.start_dirty = variables['startdirty']
@@ -84,6 +85,7 @@
         self.gdb = variables['gdb']
         self.manual_gdb = variables['manualgdb']
         self.randgen_path = variables['randgenpath']
+        self.randgen_seed = variables['randgenseed']
         # there may be a better place to put this...
         self.innobackupex_path = variables['innobackupexpath']
         self.xtrabackup_path = variables['xtrabackuppath']
@@ -239,7 +241,12 @@
             else:
                 shutil.rmtree(full_path)
             self.logging.debug("Creating directory: %s" %(dirname))   
-        os.makedirs(full_path)
+        try:
+            os.makedirs(full_path)
+        except IOError, e:
+            self.logging.error("Problem creating directory: %s" %(full_path))
+            self.logging.error(e)
+            sys.exit(1)
         return full_path
 
     def remove_dir(self, dirname, require_empty=0 ):

=== added file 'kewpie/percona_tests/__init__.py'
=== modified file 'kewpie/percona_tests/crashme/crashme_test.py'
--- kewpie/percona_tests/crashme/crashme_test.py	2011-11-23 01:07:32 +0000
+++ kewpie/percona_tests/crashme/crashme_test.py	2011-12-23 00:55:24 +0000
@@ -34,7 +34,7 @@
 
     def test_runCrashme(self):
         self.servers = servers
-        test_cmd = "$SQLBENCH_DIR/crash-me --server=mysqld --host=127.0.0.1 --force --dir=$MYSQL_TEST_WORKDIR  --connect-options=port=$MASTER_MYPORT --verbose --debug --user=root"
+        test_cmd = "$SQLBENCH_DIR/crash-me --server=mysqld --host=127.0.0.1 --force --dir=$MYSQL_TEST_WORKDIR  --connect-options=port=$MASTER_MYPORT --verbose --debug --user=root --batch-mode"
         test_status, retcode, output = execute_crashme(test_cmd, test_executor, servers)
         self.assertTrue(retcode==0, output)
         self.assertTrue(test_status=='pass', output)

=== added directory 'kewpie/percona_tests/innodbCrash'
=== added file 'kewpie/percona_tests/innodbCrash/__init__.py'
=== added file 'kewpie/percona_tests/innodbCrash/crashCommitAfterLog_test.py'
--- kewpie/percona_tests/innodbCrash/crashCommitAfterLog_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/crashCommitAfterLog_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,60 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [ "./gentest.pl"
+                        , "--grammar=conf/percona/trx_crash_commit_after_log.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()
+
+

=== added file 'kewpie/percona_tests/innodbCrash/crashCommitAfterPrepare_test.py'
--- kewpie/percona_tests/innodbCrash/crashCommitAfterPrepare_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/crashCommitAfterPrepare_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,62 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [  "./gentest.pl"
+                        , "--grammar=conf/percona/trx_crash_commit_after_prepare.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()
+
+ 
+

=== added file 'kewpie/percona_tests/innodbCrash/crashCommitAfter_test.py'
--- kewpie/percona_tests/innodbCrash/crashCommitAfter_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/crashCommitAfter_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [  "./gentest.pl"
+                        , "--grammar=conf/percona/trx_crash_commit_after.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()
+

=== added file 'kewpie/percona_tests/innodbCrash/crashCommitBeforeUnlog_test.py'
--- kewpie/percona_tests/innodbCrash/crashCommitBeforeUnlog_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/crashCommitBeforeUnlog_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [  "./gentest.pl"
+                        , "--grammar=conf/percona/trx_crash_commit_before_unlog.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()
+

=== added file 'kewpie/percona_tests/innodbCrash/crashCommitBefore_test.py'
--- kewpie/percona_tests/innodbCrash/crashCommitBefore_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/crashCommitBefore_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [  "./gentest.pl"
+                        , "--grammar=conf/percona/trx_crash_commit_before.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()
+

=== added file 'kewpie/percona_tests/innodbCrash/halfBinloggedTrx_test.py'
--- kewpie/percona_tests/innodbCrash/halfBinloggedTrx_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/halfBinloggedTrx_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,59 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [  "./gentest.pl"
+                        , "--grammar=conf/percona/trx_half_binlogged_transaction.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()
+

=== added file 'kewpie/percona_tests/innodbCrash/innodbCrash2_test.py'
--- kewpie/percona_tests/innodbCrash/innodbCrash2_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/innodbCrash2_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,140 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+import signal
+import threading
+import time
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class Worker(threading.Thread):
+    def __init__( self
+                , xid
+                , thread_desc
+                , time_delay
+                , test_executor
+                , server
+                , logging):
+      threading.Thread.__init__(self)
+      self.server = server
+      self.xid = xid
+      self.desc = thread_desc
+      self.time_delay = time_delay
+      self.test_executor = test_executor
+      self.logging = logging
+      self.start()
+
+    def finish(self):
+        return
+
+    def run(self):
+        try:
+            self.logging.test_debug( "Will crash after:%d seconds" %(self.time_delay))
+            time.sleep(self.time_delay)
+            pid = None 
+            timeout = self.time_delay*6
+            decrement = .25
+            while not pid and timeout:
+                pid = self.server.get_pid()
+                time.sleep(decrement)
+                timeout -= decrement
+            self.logging.test_debug( "Crashing server: port: %s, pid: %s" %(self.server.master_port, pid))
+            try:
+                os.kill(int(self.server.pid), signal.SIGKILL)
+                self.logging.test_debug( "Killed server pid: %s" %pid)
+            except OSError, e:
+                  self.logging.test_debug( "Didn't kill server pid: %s" %pid)
+                  self.logging.test_debug( e)
+        except Exception, e:
+            print "caught (%s)" % e
+        finally:
+            self.finish()
+
+class basicTest(innodbCrashTestCase):
+    """ This test case creates a master-slave pair
+        then generates a randgen load against the master
+        The master server is killed after %kill_db_after seconds
+        and restarted.  We restart the slave, then ensure
+        the master and slave have matching table checksums once
+        they are synced and the test load is stopped
+
+    """
+
+    def test_crash(self):
+        self.initialize(test_executor, servers, suite_config)
+        workers = []
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # generate our workload via randgen
+        test_seq = [  "./gentest.pl"
+                    , "--grammar=conf/percona/translog_concurrent1.yy"
+                    , "--queries=%d" %(self.randgen_queries_per_thread)
+                    , "--threads=%d" %(self.randgen_threads)
+                    , "--sqltrace"
+                    , "--debug"
+                    , "--seed=%s" %(self.randgen_seed)
+                   ]
+
+        while self.crashes:
+            self.logging.test_debug( "Crashes remaining: %d" %(self.crashes))
+            self.crashes -= 1
+            worker = Worker( 1 
+                           , 'time_delay_kill_thread'
+                           , self.kill_db_after 
+                           , self.test_executor
+                           , self.master_server 
+                           , self.logging
+                           )
+            workers.append(worker)
+ 
+            randgen_process = self.get_randgen_process(test_seq, self.test_executor, self.master_server)
+            #if not self.master_server.ping(quiet=True) and (randgen_process.poll() is None):
+                # Our server is dead, but randgen is running, we kill it to speed up testing
+                #randgen_process.send_signal(signal.SIGINT)
+
+            for w in workers:
+              w.join()
+            time.sleep(2)
+            while not randgen_process.poll():
+                randgen_process.send_signal(signal.SIGINT)
+
+            retcode = self.master_server.start()
+            timeout = 300
+            decrement = 1 
+            while timeout and not self.master_server.ping(quiet=True):
+                time.sleep(decrement)
+                timeout -= decrement
+            self.slave_server.slave_stop()
+            self.slave_server.slave_start()
+            self.master_server.wait_sync_with_slaves([self.slave_server],timeout=60)
+            result = self.check_slaves_by_checksum(self.master_server,[self.slave_server])
+            self.assertEqual(result,None,msg=result)
+

=== added file 'kewpie/percona_tests/innodbCrash/innodbCrash3_test.py'
--- kewpie/percona_tests/innodbCrash/innodbCrash3_test.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/innodbCrash3_test.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,58 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+from percona_tests.innodbCrash.innodbCrashTestCase import innodbCrashTestCase
+from percona_tests.innodbCrash import suite_config
+
+server_requirements = suite_config.server_requirements
+server_requests = suite_config.server_requests
+servers = suite_config.servers 
+test_executor = suite_config.test_executor 
+
+class basicTest(innodbCrashTestCase):
+
+    def test_crash(self):
+        """
+        self.logging = test_executor.logging
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads  
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread 
+        self.crashes = suite_config.crashes 
+        """
+        self.initialize(test_executor, servers, suite_config)
+
+        # create our table
+        self.test_bed_cmd = "./gendata.pl --spec=conf/percona/percona_no_blob.zz "
+        self.create_test_bed()
+
+        # Our randgen load-generation command (transactional grammar)
+        self.test_seq = [  "./gentest.pl"
+                        , "--grammar=conf/percona/trx_randDebugCrash.yy"
+                        , "--queries=%d" %(self.randgen_queries_per_thread)
+                        , "--threads=%d" %(self.randgen_threads)
+                        , "--sqltrace"
+                        , "--debug"
+                        , "--seed=%s" %(self.randgen_seed)
+                        ]
+        self.test_seq = " ".join(self.test_seq)
+        self.execute_crash_test()

=== added file 'kewpie/percona_tests/innodbCrash/innodbCrashTestCase.py'
--- kewpie/percona_tests/innodbCrash/innodbCrashTestCase.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/innodbCrashTestCase.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,69 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2011 Patrick Crews
+#
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import signal
+import time
+
+from lib.util.mysqlBaseTestCase import mysqlBaseTestCase
+
+class innodbCrashTestCase(mysqlBaseTestCase):
+    def initialize(self,test_executor, servers, suite_config):
+        self.logging = test_executor.logging
+        self.test_executor = test_executor
+        self.servers = servers
+        self.master_server = servers[0]
+        self.slave_server = servers[1]
+        self.randgen_threads = suite_config.randgen_threads
+        self.randgen_queries_per_thread = suite_config.randgen_queries_per_thread
+        self.randgen_seed = test_executor.system_manager.randgen_seed
+        self.crashes = suite_config.crashes
+        self.kill_db_after = suite_config.kill_db_after
+
+    def create_test_bed(self):
+        retcode, output = self.execute_randgen(self.test_bed_cmd, self.test_executor, self.master_server)
+        self.assertEqual(retcode,0, output)
+
+
+    def execute_crash_test(self):
+        while self.crashes:
+            self.logging.test_debug ("Crashes remaining: %d" %(self.crashes))
+            self.crashes -= 1
+ 
+            # generate our workload via randgen
+            randgen_process = self.execute_randgen(self.test_seq, self.test_executor, self.master_server)
+
+            if self.master_server.ping(quiet=True):
+                # randgen didn't kill the master : (
+                self.logging.test_debug ("Killing master manually...")
+                self.master_server.die()
+
+            retcode = self.master_server.start()
+            timeout = 300
+            decrement = 1 
+            while timeout and not self.master_server.ping(quiet=True):
+                time.sleep(decrement)
+                timeout -= decrement
+            self.slave_server.slave_stop()
+            self.slave_server.slave_start()
+            self.master_server.wait_sync_with_slaves([self.slave_server],timeout=60)
+            result = self.check_slaves_by_checksum(self.master_server,[self.slave_server])
+            self.assertEqual(result,None,msg=result)
+

=== added file 'kewpie/percona_tests/innodbCrash/suite_config.py'
--- kewpie/percona_tests/innodbCrash/suite_config.py	1970-01-01 00:00:00 +0000
+++ kewpie/percona_tests/innodbCrash/suite_config.py	2011-12-23 00:55:24 +0000
@@ -0,0 +1,29 @@
+# suite_config.py
+# module containing suite-wide standard variables
+# provides single place to tweak how all related tests run
+
+server_requirements = [ [ ("--binlog-do-db=test "
+                           "--innodb-file-per-table "
+                           "--innodb_file_format='Barracuda' "
+                           #"--innodb_log_compressed_pages=0 "
+                           #"--innodb_background_checkpoint=0 "
+                           "--sync_binlog=100 "
+                           "--innodb_flush_log_at_trx_commit=2 "
+                           )]
+                       ,[ ("--innodb_file_format='Barracuda' "
+                           #"--innodb_log_compressed_pages=1 "
+                           "--innodb_flush_log_at_trx_commit=2"
+                          )]
+                      ]
+server_requests = {'join_cluster':[(0,1)]}
+servers = []
+server_manager = None
+test_executor = None
+randgen_threads = 5
+randgen_queries_per_thread = 10000
+crashes = 10 
+# This only applies to innodbCrash2 test
+# as a time delay for when the kill thread
+# will stop the master-server
+kill_db_after = 20 
+