← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/server_mgmt/server_management.py

Merge Patrick - 709646: --engine in dbqp.py is broken 
Merge Patrick - 717359: dbqp needs --repeat option

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/server_management.py
52
52
        self.logging = system_manager.logging
53
53
        self.gdb  = self.system_manager.gdb
54
54
        self.code_tree = system_manager.code_tree
 
55
        self.default_storage_engine = variables['defaultengine']
55
56
        self.user_server_opts = variables['drizzledoptions']
56
57
        self.servers = {}
57
58
        # We track this
59
60
        self.mutex = thread.allocate_lock()
60
61
        self.timer_increment = .5
61
62
 
 
63
        self.logging.info("Using default-storage-engine: %s" %(self.default_storage_engine))
 
64
 
62
65
        if self.debug:
63
66
            self.logging.debug_class(self)
64
67
 
104
107
        # initialize our new server_object
105
108
        if self.code_tree.type == 'Drizzle':
106
109
          from lib.server_mgmt.drizzled import drizzleServer as server_type
107
 
        new_server = server_type( server_name, self, server_options
108
 
                                , requester, workdir )
 
110
        new_server = server_type( server_name
 
111
                                , self
 
112
                                , self.default_storage_engine
 
113
                                , server_options
 
114
                                , requester
 
115
                                , workdir )
109
116
        self.add_server(requester, new_server)
110
117
        return new_server
111
118
 
332
339
        remove_options = [ '--restart'
333
340
                         , '--skip-stack-trace'
334
341
                         , '--skip-core-file'
 
342
                         , '--'
335
343
                         ]
336
344
        for remove_option in remove_options:
337
345
            if remove_option in server_options: