← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/sys_mgmt/port_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/sys_mgmt/port_management.py
130
130
                    if self.system_manager.cur_os in [ 'FreeBSD' 
131
131
                                                     , 'Darwin' 
132
132
                                                     ]:
133
 
                        used_port = int(entry.split()[3].split('.')[-1].strip())
134
 
                    else:
135
 
                        used_port = int(entry.split()[3].split(':')[-1].strip())
 
133
                        split_token = '.'
 
134
                    else:
 
135
                        split_token = ':'
 
136
                    port_candidate = entry.split()[3].split(split_token)[-1].strip()
 
137
                    if port_candidate.isdigit():
 
138
                        used_port = int(port_candidate)
 
139
                    else:
 
140
                        used_port = None # not a value we can use
136
141
                if port == used_port:
137
142
                    if entry.split()[-1] != "TIME_WAIT":
138
143
                        return 1