Merge lp:~longbow/kewpie/opt-matrix into lp:kewpie

[Valentine Gostev]

Implemented matrixManager class which allows to store custom attributes
in a separate dictionary and access them from test like:
test_executor.matrix_manager.option_matrix['custom attr name']

[lp:~longbow/kewpie/opt-matrix]

117. By Patrick Crews on 2012-02-20

Incorporate changes to better work with Galera replication for tests. Added convenience functions to base test case class

[Patrick Crews (patrick-crews)]

Looks good. This will be very useful!

review: Approve

[lp:~longbow/kewpie/opt-matrix]

118. By Patrick Crews on 2012-02-20

Merge Valentine's code for matrix manager - updates to codership / galera changes to ensure queries can execute even without an init_command

=== modified file 'kewpie.py'
--- kewpie.py	2012-02-06 18:37:56 +0000
+++ kewpie.py	2012-02-20 20:54:17 +0000
@@ -43,6 +43,7 @@
 from lib.server_mgmt.server_management import serverManager
 from lib.sys_mgmt.system_management import systemManager
 from lib.test_mgmt.execution_management import executionManager
+from lib.opts.matrix_manager import matrixManager
 
 # functions
 def handle_sys_config(input_args, defaults):
@@ -83,6 +84,8 @@
 execution_manager = None
 
 try:
+        # Instantinate option matrix
+        matrix_manager = matrixManager(variables)
         # Some system-level work is constant regardless
         # of the test to be run
         system_manager = systemManager(variables)
@@ -99,7 +102,7 @@
         # Initialize test execution manager
         execution_manager = executionManager(server_manager, system_manager
                                         , test_manager, test_executor
-                                        , variables)
+                                        , variables, matrix_manager)
 
         # Execute our tests!
         execution_manager.execute_tests()

=== added file 'lib/opts/matrix_manager.py'
--- lib/opts/matrix_manager.py	1970-01-01 00:00:00 +0000
+++ lib/opts/matrix_manager.py	2012-02-20 20:54:17 +0000
@@ -0,0 +1,34 @@
+#! /usr/bin/env python
+# -*- mode: python; indent-tabs-mode: nil; -*-
+# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+#
+# Copyright (C) 2012 Valentine Gostev 
+#
+# 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
+
+"""matrix_manager.py
+   class which imports opt-matrix option set and stores in a separate dict
+
+"""
+
+class matrixManager:
+    def __init__(self, variables):
+        if not variables['optmatrix']:
+            return None
+        matrix_list=[]
+        for i in variables['optmatrix'].split(','):
+            option_tuple = i.split('=')[0], i.split('=')[1]
+            matrix_list.append(option_tuple)
+        self.option_matrix = dict(matrix_list)

=== modified file 'lib/opts/test_run_options.py'
--- lib/opts/test_run_options.py	2012-02-03 00:40:10 +0000
+++ lib/opts/test_run_options.py	2012-02-20 20:54:17 +0000
@@ -217,6 +217,13 @@
       , help="Alter the seed value provided to the random query generator to vary test runs. (string) [%default]"
       )
 
+    test_exec_control_group.add_option(
+        "--opt-matrix"
+      , dest="optmatrix"
+      , default=''
+      , help="Specify custom options for tests in --opt-matrix=\"option1=value1,option2=value2\" format"
+      )
+
     parser.add_option_group(test_exec_control_group)
 
     test_control_group = optparse.OptionGroup(parser, 

=== modified file 'lib/test_mgmt/execution_management.py'
--- lib/test_mgmt/execution_management.py	2011-10-05 20:26:34 +0000
+++ lib/test_mgmt/execution_management.py	2012-02-20 20:54:17 +0000
@@ -39,10 +39,11 @@
     """
 
     def __init__(self, server_manager, system_manager, test_manager
-                 , executor_type, variables):
+                 , executor_type, variables, matrix_manager):
 
         self.server_manager = server_manager
         self.system_manager = system_manager
+        self.matrix_manager = matrix_manager
         self.logging = system_manager.logging
         self.test_manager = test_manager
         if variables['verbose']:

=== modified file 'lib/test_mgmt/test_execution.py'
--- lib/test_mgmt/test_execution.py	2012-01-26 01:54:17 +0000
+++ lib/test_mgmt/test_execution.py	2012-02-20 20:54:17 +0000
@@ -57,6 +57,7 @@
         self.test_manager = self.execution_manager.test_manager
         self.server_manager = self.execution_manager.server_manager
         self.time_manager = self.system_manager.time_manager
+        self.matrix_manager = self.execution_manager.matrix_manager
         self.name = name
         self.working_environment = {} # we pass env dict to define what we need
         self.dirset = { self.name : { 'log': None } }