← 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: Mark Atwood
  • Date: 2011-06-04 22:59:55 UTC
  • mfrom: (2318.1.1 dbqp_bugfix)
  • Revision ID: me@mark.atwood.name-20110604225955-6e1lkh0yu15v63fz
merge lp:~patrick-crews/drizzle/bug788394

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/drizzled.py
167
167
    def get_stop_cmd(self):
168
168
        """ Return the command that will shut us down """
169
169
        
170
 
        return "%s --user=root --port=%d --shutdown " %(self.drizzle_client_path, self.master_port)
 
170
        return "%s --user=root --port=%d --connect-timeout=5 --silent --password= --shutdown " %(self.drizzle_client_path, self.master_port)
171
171
           
172
172
 
173
173
    def get_ping_cmd(self):