exit not _exit, for benefit of coverage testing

diff --git a/server/state.c b/server/state.c
index 66760f0963f1353a9db68162763c3eb48462b441..79cae43bbf2f4b957667c6488ae0b3343437276c 100644 (file)
--- a/server/state.c
+++ b/server/state.c
@@ -57,7 +57,7 @@ void quit(ev_source *ev) {
   trackdb_close();
   trackdb_deinit();
   info("terminating");
   trackdb_close();
   trackdb_deinit();
   info("terminating");

-  _exit(0);
+  exit(0);

 }
 
 static void reset_socket(ev_source *ev) {
 }
 
 static void reset_socket(ev_source *ev) {

diff --git a/tests/dtest.py b/tests/dtest.py
index bedbec9a84cb33dec1203ffa235ba6453873e174..cd14cfbbce5cd7df210bcd9241c25153cd510079 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -169,6 +169,7 @@ stopword the a an and to too in on of we i am as im for is
 username fred
 password fredpass
 allow fred fredpass
 username fred
 password fredpass
 allow fred fredpass

+trust fred

 plugins
 plugins %s/plugins
 plugins %s/plugins/.libs
 plugins
 plugins %s/plugins
 plugins %s/plugins/.libs


@@ -232,7 +233,7 @@ Stop the daemon if it has not stopped already"""
     rc = daemon.poll()
     if rc == None:
         print " stopping daemon"
     rc = daemon.poll()
     if rc == None:
         print " stopping daemon"

-        os.kill(daemon.pid, 15)
+        disorder.client().shutdown()

         print "  waiting for daemon"
         rc = daemon.wait()
         print "  daemon has stopped"
         print "  waiting for daemon"
         rc = daemon.wait()
         print "  daemon has stopped"