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

[Patrick Crews]

updates to server management code to deal with a situation where the server wasn't running, but the server_manager didn't know to restart it : (

=== modified file 'tests/lib/server_mgmt/server_management.py'
--- tests/lib/server_mgmt/server_management.py	2011-01-27 20:13:55 +0000
+++ tests/lib/server_mgmt/server_management.py	2011-01-31 22:39:38 +0000
@@ -131,8 +131,11 @@
             while not server.ping(quiet= True) and attempts_remain:
                 time.sleep(1)
                 attempts_remain = attempts_remain - 1
-        if server.status == 1 or server.ping(quiet=True):
+        if server.ping(quiet=True):
             server.stop()
+        else:
+            # make sure the server is indicated as stopped
+            server.status = 0
 
     def stop_servers(self, requester):
         """ Stop all servers running for the requester """

=== modified file 'tests/lib/sys_mgmt/port_management.py'
--- tests/lib/sys_mgmt/port_management.py	2011-01-29 20:26:04 +0000
+++ tests/lib/sys_mgmt/port_management.py	2011-01-31 22:39:38 +0000
@@ -130,9 +130,14 @@
                     if self.system_manager.cur_os in [ 'FreeBSD' 
                                                      , 'Darwin' 
                                                      ]:
-                        used_port = int(entry.split()[3].split('.')[-1].strip())
-                    else:
-                        used_port = int(entry.split()[3].split(':')[-1].strip())
+                        split_token = '.'
+                    else:
+                        split_token = ':'
+                    port_candidate = entry.split()[3].split(split_token)[-1].strip()
+                    if port_candidate.isdigit():
+                        used_port = int(port_candidate)
+                    else:
+                        used_port = None # not a value we can use
                 if port == used_port:
                     if entry.split()[-1] != "TIME_WAIT":
                         return 1