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

[Patrick Crews]

Fixes how we parse netstat output during port allocation checks.

=== modified file 'tests/lib/sys_mgmt/port_management.py'
--- tests/lib/sys_mgmt/port_management.py	2011-01-21 18:47:56 +0000
+++ tests/lib/sys_mgmt/port_management.py	2011-01-27 20:39:58 +0000
@@ -107,7 +107,16 @@
             if entry.startswith('Proto'):
                 good_data = 1
             elif good_data:
-                used_port = int(entry.split()[3].split(':')[-1].strip())
+                # We try to catch additional output
+                # like we see with freebsd
+                if entry.startswith('Active'):
+                    good_data = 0
+                    pass
+                else:
+                    if self.system_manager.cur_os == 'FreeBSD':
+                        used_port = int(entry.split()[3].split('.')[-1].strip())
+                    else:
+                        used_port = int(entry.split()[3].split(':')[-1].strip())
                 if port == used_port:
                     if entry.split()[-1] != "TIME_WAIT":
                         return 1

=== modified file 'tests/lib/sys_mgmt/system_management.py'
--- tests/lib/sys_mgmt/system_management.py	2011-01-26 01:13:20 +0000
+++ tests/lib/sys_mgmt/system_management.py	2011-01-27 20:39:58 +0000
@@ -49,6 +49,7 @@
         self.env_var_delimiter = ':'
         self.no_shm = variables['noshm']
         self.shm_path = self.find_path(["/dev/shm", "/tmp"], required=0)
+        self.cur_os = os.uname()[0]
         self.symlink_name = 'dtr_work_sym'
         self.workdir = variables['workdir']
         self.start_dirty = variables['startdirty']