From 445a0f664a3714c55b89c175c824b7d43cc990c2 Mon Sep 17 00:00:00 2001 Message-Id: <445a0f664a3714c55b89c175c824b7d43cc990c2.1714941881.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 1 Dec 2007 17:36:27 +0000 Subject: [PATCH] exit not _exit, for benefit of coverage testing Organization: Straylight/Edgeware From: Richard Kettlewell --- server/state.c | 2 +- tests/dtest.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/state.c b/server/state.c index 66760f0..79cae43 100644 --- a/server/state.c +++ b/server/state.c @@ -57,7 +57,7 @@ void quit(ev_source *ev) { trackdb_close(); trackdb_deinit(); info("terminating"); - _exit(0); + exit(0); } static void reset_socket(ev_source *ev) { diff --git a/tests/dtest.py b/tests/dtest.py index bedbec9..cd14cfb 100644 --- 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 +trust fred 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" - os.kill(daemon.pid, 15) + disorder.client().shutdown() print " waiting for daemon" rc = daemon.wait() print " daemon has stopped" -- [mdw]