← 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: Lee Bieber
  • Date: 2011-02-01 00:45:23 UTC
  • mfrom: (2131.2.4 build)
  • Revision ID: kalebral@gmail.com-20110201004523-4li8i1mvawn0ebz4
Merge Patrick - 710942: dbqp not recovering from certain tests with non-started servers
Merge Patrick - 709861: dbqp not running on mac osx
Merge Andrew - 702582: SHOW INNODB STATUS should error
Merge Monty - Remove a leftover warning from a previous attempt at fixing the OSX issue

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/server_management.py
131
131
            while not server.ping(quiet= True) and attempts_remain:
132
132
                time.sleep(1)
133
133
                attempts_remain = attempts_remain - 1
134
 
        if server.status == 1 or server.ping(quiet=True):
 
134
        if server.ping(quiet=True):
135
135
            server.stop()
 
136
        else:
 
137
            # make sure the server is indicated as stopped
 
138
            server.status = 0
136
139
 
137
140
    def stop_servers(self, requester):
138
141
        """ Stop all servers running for the requester """