← 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: Brian Aker
  • Date: 2011-03-25 05:17:36 UTC
  • mfrom: (2249.1.1 drizzle_exp)
  • Revision ID: brian@tangent.org-20110325051736-fs4m4cel7kci57b1
Merge in Patrick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/server_management.py
185
185
        else:
186
186
            # manual-gdb issue
187
187
            server_retcode = 0
 
188
        
188
189
        timer = float(0)
189
190
        timeout = float(server.server_start_timeout)
190
191
 
206
207
     
207
208
        if server_retcode == 0:
208
209
            server.status = 1 # we are running
 
210
            if os.path.exists(server.pid_file):
 
211
                pid_file = open(server.pid_file,'r')
 
212
                pid = pid_file.readline().strip()
 
213
                pid_file.close()
 
214
                server.pid = pid
209
215
 
210
216
        if server_retcode != 0 and not expect_fail and self.debug:
211
217
            self.logging.debug("Server startup command: %s failed with error code %d" %( start_cmd