Speed up servertest for unresponsive servers.

1 files changed, 7 insertions, 7 deletions

diff --git a/test/test_server.py b/test/test_server.py
index db64a6d..d682d4a 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -56,14 +56,14 @@ class TestServer(unittest.TestCase):
 
     def tearDown(self):
         if self.skip: return
-        for i in range(10):
-            if self.p.poll() != None: break
-            os.kill(self.p.pid, signal.SIGINT)
-            time.sleep(0.1*i)
-        for i in range(10):
-            if self.p.poll() != None: break
+
+        if self.p.poll() == None:
             os.kill(self.p.pid, signal.SIGINT)
-            time.sleep(i)
+            time.sleep(0.5)
+        while self.p.poll() == None:
+            os.kill(self.p.pid, signal.SIGTERM)
+            time.sleep(1)
+
         for stream in (self.p.stdout, self.p.stderr):
             for line in stream:
                 if tob('warning') in line.lower():