From 77b521b09666ff694a7bf746ef8e910ca0a53d48 Mon Sep 17 00:00:00 2001 Message-Id: <77b521b09666ff694a7bf746ef8e910ca0a53d48.1714329175.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 24 Oct 2009 17:54:47 +0100 Subject: [PATCH] Remove extraneous logging. Remove sleep in tests, it shouldn't be needed now. Organization: Straylight/Edgeware From: Richard Kettlewell --- lib/event.c | 5 +---- tests/dtest.py | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/event.c b/lib/event.c index 0c1e99a..b63d0f6 100644 --- a/lib/event.c +++ b/lib/event.c @@ -767,8 +767,7 @@ void ev_child_killall(ev_source *ev) { error(errno, "sending SIGTERM to pid %lu", (unsigned long)ev->children[n].pid); ev->children[n].pid = -1; - } else - info("sent SIGTERM to pid %lu", (unsigned long)ev->children[n].pid); + } } for(n = 0; n < ev->nchildren; ++n) { if(ev->children[n].pid == -1) @@ -780,8 +779,6 @@ void ev_child_killall(ev_source *ev) { error(errno, "waiting for pid %lu", (unsigned long)ev->children[n].pid); continue; } - info("pid %lu exited with status %#x", - (unsigned long)ev->children[n].pid, w); } ev->nchildren = 0; } diff --git a/tests/dtest.py b/tests/dtest.py index 67b2b8f..235d746 100644 --- a/tests/dtest.py +++ b/tests/dtest.py @@ -297,8 +297,6 @@ Stop the daemon if it has not stopped already""" else: print " daemon already stopped" daemon = None - # Wait a bit for subprocess to finish too, to try to avoid stupid races - time.sleep(2) def run(module=None, report=True): """dtest.run(MODULE) -- [mdw]