Leave a bit of headroom above test port number, since we go at least

[disorder] / tests / dtest.py

diff --git a/tests/dtest.py b/tests/dtest.py
index dd3c3a2d8a22c2fe5b034b2f9c3fe972735ddbbd..8a4644a128e2efc94887ab6d72a9749fdc7e66c5 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -202,10 +202,10 @@ def common_setup():
     os.mkdir(testroot)
     # Choose a port
     global port
-    port = random.randint(49152, 65535)
+    port = random.randint(49152, 65530)
     while not bindable(port + 1):
         print "port %d is not bindable, trying another" % (port + 1)
-        port = random.randint(49152, 65535)
+        port = random.randint(49152, 65530)
     # Log anything sent to that port
     packetlog = "%s/packetlog" % testroot
     subprocess.Popen(["disorder-udplog",
@@ -287,10 +287,10 @@ Stop the daemon if it has not stopped already"""
     rc = daemon.poll()
     if rc == None:
         print " stopping daemon"
-        disorder.client().shutdown()
+        os.kill(daemon.pid, 15)
         print "  waiting for daemon"
         rc = daemon.wait()
-        print "  daemon has stopped"
+        print "  daemon has stopped (rc=%d)" % rc
     else:
         print "  daemon already stopped"
     daemon = None