Merge lp:~patrick-crews/drizzle/dbqp_mac_fix into lp:drizzle/7.0

Proposed by Patrick Crews
Status: Merged
Approved by: Lee Bieber
Approved revision: 2132
Merged at revision: 2132
Proposed branch: lp:~patrick-crews/drizzle/dbqp_mac_fix
Merge into: lp:drizzle/7.0
Diff against target: 21 lines (+8/-3)
1 file modified
tests/lib/sys_mgmt/port_management.py (+8/-3)
To merge this branch: bzr merge lp:~patrick-crews/drizzle/dbqp_mac_fix
Reviewer Review Type Date Requested Status
Drizzle Developers Pending
Review via email: mp+48055@code.launchpad.net

Description of the change

further updates to port_management to handle mac osx netstat output. Tested a-ok on hades : )

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/lib/sys_mgmt/port_management.py'
2--- tests/lib/sys_mgmt/port_management.py 2011-01-29 20:26:04 +0000
3+++ tests/lib/sys_mgmt/port_management.py 2011-01-31 21:13:47 +0000
4@@ -130,9 +130,14 @@
5 if self.system_manager.cur_os in [ 'FreeBSD'
6 , 'Darwin'
7 ]:
8- used_port = int(entry.split()[3].split('.')[-1].strip())
9- else:
10- used_port = int(entry.split()[3].split(':')[-1].strip())
11+ split_token = '.'
12+ else:
13+ split_token = ':'
14+ port_candidate = entry.split()[3].split(split_token)[-1].strip()
15+ if port_candidate.isdigit():
16+ used_port = int(port_candidate)
17+ else:
18+ used_port = None # not a value we can use
19 if port == used_port:
20 if entry.split()[-1] != "TIME_WAIT":
21 return 1

Subscribers

People subscribed via source and target branches