Remove extraneous logging.

Remove sleep in tests, it shouldn't be needed now.

diff --git a/lib/event.c b/lib/event.c
index 0c1e99a5cb8319d1ef40a25c7e6601aadef9630d..b63d0f6b16267c6d23c589d7ef542fa04e37bb94 100644 (file)
--- 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 67b2b8f6afd6cc08d0f4942a9cba70139a927782..235d7467a73703fba565609ce18247f02f66148d 100644 (file)
--- 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)