Merge lp:~patrick-crews/drizzle/dbqp_engine_and_repeat into lp:drizzle/7.0

[Patrick Crews]

Adds repeat option and fixes --default-storage-engine

[lp:~patrick-crews/drizzle/dbqp_engine_and_repeat]

2171. By Patrick Crews on 2011-02-17

Minor tweak for gdb

=== modified file 'docs/testing/dbqp.rst'
--- docs/testing/dbqp.rst	2011-02-12 00:01:28 +0000
+++ docs/testing/dbqp.rst	2011-02-17 00:34:16 +0000
@@ -254,6 +254,11 @@
    sort the testcases so that they are executed optimally
    for the given mode [False]
 
+.. option:: --repeat=REPEAT     
+    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 [1]
+
 Options for defining the code that will be under test
 -----------------------------------------------------
 

=== modified file 'tests/dbqp.py'
--- tests/dbqp.py	2011-02-09 17:41:08 +0000
+++ tests/dbqp.py	2011-02-17 00:34:16 +0000
@@ -82,8 +82,10 @@
 # TODO - make a more robust cleanup
 # At the moment, runaway servers are our biggest concern
     if server_manager and not variables['startandexit']:
-        server_manager.cleanup()
-
+        if variables['gdb']:
+            server_manager.cleanup_all_servers)
+        else:
+            server_manager.cleanup()
     if not variables['startandexit']:
         if test_manager:
             fail_count = test_manager.has_failing_tests()

=== modified file 'tests/lib/server_mgmt/drizzled.py'
--- tests/lib/server_mgmt/drizzled.py	2011-02-11 23:56:37 +0000
+++ tests/lib/server_mgmt/drizzled.py	2011-02-17 00:34:16 +0000
@@ -40,8 +40,13 @@
 
     """
 
-    def __init__(self, name, server_manager, server_options
-                , requester, workdir_root):
+    def __init__( self
+                , name
+                , server_manager
+                , default_storage_engine
+                , server_options
+                , requester
+                , workdir_root):
         self.skip_keys = [ 'server_manager'
                          , 'system_manager'
                          , 'dirset'
@@ -55,6 +60,7 @@
         self.initial_run = 1
         self.owner = requester
         self.server_options = server_options
+        self.default_storage_engine = default_storage_engine
         self.server_manager = server_manager
         # We register with server_manager asap
         self.server_manager.log_server(self, requester)
@@ -168,6 +174,7 @@
                       , "--mysql-unix-socket-protocol.path=%s" %(self.socket_file)
                       , "--pid-file=%s" %(self.pid_file)
                       , "--drizzle-protocol.port=%d" %(self.drizzle_tcp_port)
+                      , "--default-storage-engine=%s" %(self.default_storage_engine)
                       , "--datadir=%s" %(self.datadir)
                       , "--tmpdir=%s" %(self.tmpdir)
                       , self.secure_file_string

=== modified file 'tests/lib/server_mgmt/server_management.py'
--- tests/lib/server_mgmt/server_management.py	2011-02-11 23:56:37 +0000
+++ tests/lib/server_mgmt/server_management.py	2011-02-17 00:34:16 +0000
@@ -52,6 +52,7 @@
         self.logging = system_manager.logging
         self.gdb  = self.system_manager.gdb
         self.code_tree = system_manager.code_tree
+        self.default_storage_engine = variables['defaultengine']
         self.user_server_opts = variables['drizzledoptions']
         self.servers = {}
         # We track this
@@ -59,6 +60,8 @@
         self.mutex = thread.allocate_lock()
         self.timer_increment = .5
 
+        self.logging.info("Using default-storage-engine: %s" %(self.default_storage_engine))
+
         if self.debug:
             self.logging.debug_class(self)
 
@@ -104,8 +107,12 @@
         # initialize our new server_object
         if self.code_tree.type == 'Drizzle':
           from lib.server_mgmt.drizzled import drizzleServer as server_type
-        new_server = server_type( server_name, self, server_options
-                                , requester, workdir )
+        new_server = server_type( server_name
+                                , self
+                                , self.default_storage_engine
+                                , server_options
+                                , requester
+                                , workdir )
         self.add_server(requester, new_server)
         return new_server
 
@@ -332,6 +339,7 @@
         remove_options = [ '--restart'
                          , '--skip-stack-trace'
                          , '--skip-core-file'
+                         , '--'
                          ]
         for remove_option in remove_options:
             if remove_option in server_options:

=== modified file 'tests/lib/test_mgmt/execution_management.py'
--- tests/lib/test_mgmt/execution_management.py	2011-02-04 20:41:08 +0000
+++ tests/lib/test_mgmt/execution_management.py	2011-02-17 00:34:16 +0000
@@ -61,6 +61,7 @@
         self.verbose = variables['verbose']
         self.force = variables['force']
         self.record_flag = variables['record']
+        self.testcase_repeat_count = variables['repeat']
         # We are currently single-threaded execution-wise
         # but in the future, we will likely need to revamp
         # how we deal with start-and-exit if we have multiple

=== modified file 'tests/lib/test_mgmt/test_execution.py'
--- tests/lib/test_mgmt/test_execution.py	2011-02-11 23:56:37 +0000
+++ tests/lib/test_mgmt/test_execution.py	2011-02-17 00:34:16 +0000
@@ -51,6 +51,7 @@
         self.status = 0 # not running
         self.execution_manager = execution_manager
         self.system_manager = self.execution_manager.system_manager
+        self.testcase_repeat_count = self.execution_manager.testcase_repeat_count
         self.cmd_prefix = self.system_manager.cmd_prefix
         self.logging = self.system_manager.logging
         self.test_manager = self.execution_manager.test_manager
@@ -149,11 +150,12 @@
             self.get_testCase()
             self.handle_system_reqs()
             self.handle_server_reqs(start_and_exit)
-            self.execute_testCase()
-            self.record_test_result()
-            if self.current_test_status == 'fail' and not self.execution_manager.force:
-                self.logging.error("Failed test.  Use --force to execute beyond the first test failure")
-                keep_running = 0
+            for i in range(self.testcase_repeat_count):
+                self.execute_testCase()
+                self.record_test_result()
+                if self.current_test_status == 'fail' and not self.execution_manager.force:
+                    self.logging.error("Failed test.  Use --force to execute beyond the first test failure")
+                    keep_running = 0
         self.status = 0
 
     def execute_testCase(self):

=== modified file 'tests/lib/test_run_options.py'
--- tests/lib/test_run_options.py	2011-02-11 23:56:37 +0000
+++ tests/lib/test_run_options.py	2011-02-17 00:34:16 +0000
@@ -51,8 +51,13 @@
     variables = {}
     variables = vars(args)
     variables['test_cases']= test_cases
+    # This code should become a function once
+    # enough thought has been given to it
     if variables['manualgdb']:
         variables['gdb']=True
+    if variables['repeat'] <= 0:
+        print "Setting --repeat=1.  You chose a silly value that I will ignore :P"
+        variables['repeat'] = 1
     return variables
 
 # Create the CLI option parser
@@ -184,7 +189,14 @@
   , 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)
 # end test_control_group