summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Chevalier <chevalier.ronny@gmail.com>2014-11-11 19:48:27 +0100
committerTom Gundersen <teg@jklm.no>2014-11-13 10:39:51 +0100
commit07aa32e31d82d1239a618e07adedaecd35d96b27 (patch)
treec6610380f0be12b9471eb47e05e8714f08c2a9de
parentb4c72e52d2109fe7f0ac3440c81ae3e1ce64a143 (diff)
manager: allow test run to catch SIGCHLD events
Otherwise we cannot know when a service exited
-rw-r--r--src/core/manager.c3
-rw-r--r--src/test/test-path.c1
2 files changed, 0 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c
index 6c7eac2722..1bc36a6c41 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -393,9 +393,6 @@ static int manager_setup_signals(Manager *m) {
assert(m);
- if (m->test_run)
- return 0;
-
assert_se(sigaction(SIGCHLD, &sa, NULL) == 0);
/* We make liberal use of realtime signals here. On
diff --git a/src/test/test-path.c b/src/test/test-path.c
index 29b187a423..18fcb575e6 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -104,7 +104,6 @@ static void check_stop_unlink(Manager *m, Unit *unit, const char *test_path, con
}
assert_se(UNIT_VTABLE(unit)->stop(unit) >= 0);
- assert_se(UNIT_VTABLE(service_unit)->stop(service_unit) >= 0);
rm_rf_dangerous(test_path, false, true, false);
}