← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/dbqp_modes/sqlbench/sqlbench_test_management.py

  • Committer: patrick crews
  • Date: 2011-10-05 20:40:33 UTC
  • mfrom: (2337.1.24 dbqp_revamp2)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: gleebix@gmail.com-20111005204033-5m6kvcii1q87yur6
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/dbqp_modes/sqlbench/sqlbench_test_management.py
77
77
 
78
78
    """
79
79
 
80
 
    def __init__(self, verbose, debug, default_engine, dotest, skiptest
81
 
                , reorder, suitelist, suitepaths, system_manager
82
 
                , test_cases, mode):
83
 
        super(testManager, self).__init__( verbose, debug, default_engine
84
 
                                         , dotest, skiptest, reorder
85
 
                                         , suitelist, suitepaths
86
 
                                         , system_manager, test_cases, mode)
 
80
    def __init__( self, variables, system_manager):
 
81
        super(testManager, self).__init__( variables, system_manager)
87
82
        self.suitepaths = [os.path.join(self.testdir,'sqlbench_tests')]
88
 
        if suitelist is None:
 
83
        if variables['suitelist'] is None:
89
84
            self.suitelist = ['main']
90
85
        else:
91
 
            self.suitelist = suitelist
 
86
            self.suitelist = variables['suitelist']
92
87
 
93
88
    def process_suite(self,suite_dir):
94
89
        """Process a test suite.
98
93
 
99
94
        # We know this based on how we organize sqlbench test conf files
100
95
        suite_name = os.path.basename(suite_dir) 
101
 
        if self.verbose:
102
 
                self.system_manager.logging.verbose("Processing suite: %s" %(suite_name))
 
96
        self.system_manager.logging.verbose("Processing suite: %s" %(suite_name))
103
97
        testlist = [os.path.join(suite_dir,test_file) for test_file in sorted(os.listdir(suite_dir)) if test_file.endswith('.cnf')]
104
98
 
105
99
        # Search for specific test names
172
166
 
173
167
    """
174
168
 
175
 
    def __init__(self, verbose, debug, default_engine, dotest, skiptest
176
 
                , reorder, suitelist, suitepaths, system_manager
177
 
                , test_cases, mode):
178
 
        super(testManager, self).__init__( verbose, debug, default_engine
179
 
                                         , dotest, skiptest, reorder
180
 
                                         , suitelist, suitepaths
181
 
                                         , system_manager, test_cases, mode)
 
169
    def __init__( self, variables, system_manager):
 
170
        super(testManager, self).__init__( variables, system_manager)
182
171
        self.suitepaths = [os.path.join(self.testdir,'crashme_tests')]
183
 
        if suitelist is None:
 
172
        if variables['suitelist'] is None:
184
173
            self.suitelist = ['main']
185
174
        else:
186
 
            self.suitelist = suitelist
 
175
            self.suitelist = variables['suitelist']
187
176
 
188
177
    def record_test_result(self, test_case, test_status, output, exec_time):
189
178
        """ Accept the results of an executed testCase for further