← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/server_mgmt/drizzled.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/server_mgmt/drizzled.py
41
41
 
42
42
    """
43
43
 
44
 
    def __init__( self, name, server_manager, default_storage_engine
 
44
    def __init__( self, name, server_manager, code_tree, default_storage_engine
45
45
                , server_options, requester, workdir_root):
46
 
        super(drizzleServer, self).__init__( name, server_manager
 
46
        super(drizzleServer, self).__init__( name
 
47
                                           , server_manager
 
48
                                           , code_tree
47
49
                                           , default_storage_engine
48
 
                                           , server_options, requester
 
50
                                           , server_options
 
51
                                           , requester
49
52
                                           , workdir_root)
50
 
        self.code_tree = self.system_manager.code_tree
51
53
        self.preferred_base_port = 9306
52
54
        
53
55
        # client files
58
60
        self.server_path = self.code_tree.drizzle_server
59
61
        self.drizzle_client_path = self.code_tree.drizzle_client
60
62
        self.schemawriter = self.code_tree.schemawriter
 
63
        self.trx_reader = self.code_tree.trx_reader
61
64
 
62
65
        # Get our ports
63
66
        self.port_block = self.system_manager.port_manager.get_port_block( self.name
112
115
        self.initialize_databases()
113
116
        self.take_db_snapshot()
114
117
 
115
 
        if self.debug:
116
 
            self.logging.debug_class(self)
 
118
        self.logging.debug_class(self)
117
119
 
118
120
    def report(self):
119
121
        """ We print out some general useful info """