← 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

  • Committer: patrick crews
  • Date: 2011-06-28 21:07:43 UTC
  • mto: (2429.2.1 dbqp_revamp)
  • mto: This revision was merged to the branch mainline in revision 2435.
  • Revision ID: gleebix@gmail.com-20110628210743-vkwxw84rs6lcmtb3
Code cleanup / reorganization

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/server_management.py
2
2
# -*- mode: python; indent-tabs-mode: nil; -*-
3
3
# vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
4
4
#
5
 
# Copyright (C) 2010 Patrick Crews
 
5
# Copyright (C) 2010, 2011 Patrick Crews
6
6
#
7
7
# This program is free software; you can redistribute it and/or modify
8
8
# it under the terms of the GNU General Public License as published by
116
116
        server_name = self.get_server_name(requester)
117
117
 
118
118
        # initialize our new server_object
 
119
        # get the right codeTree type from the code manager
 
120
        code_tree = self.code_manager.get_tree(server_type, server_version)
 
121
 
 
122
        # import the correct server type object
119
123
        if server_type == 'drizzle':
120
 
          # get the right codeTree type from the code manager
121
 
          code_tree = self.code_manager.get_tree(server_type, server_version)
122
 
          from lib.server_mgmt.drizzled import drizzleServer as server_type
 
124
            from lib.server_mgmt.drizzled import drizzleServer as server_type
 
125
        elif server_type == 'mysql':
 
126
            from lib.server_mgmt.mysqld import mysqlServer as server_type
 
127
 
123
128
        new_server = server_type( server_name
124
129
                                , self
125
130
                                , code_tree