From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 24 May 2009 11:42:49 +0000 (+0100)
Subject: Tests terminate server with SIGTERM rather than trying to send a
X-Git-Tag: 5.0~113
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/12746062f84786be964d41ce73017fb780183826?ds=sidebyside

Tests terminate server with SIGTERM rather than trying to send a
shutdown command; the latter may not work if users haven't been set up
right.
---

diff --git a/tests/dtest.py b/tests/dtest.py
index dd3c3a2..e2fed30 100644
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -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