summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-19 13:05:43 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-19 21:53:23 +0100
commit1acacd737b2a831e7cce4049d42df254718a4543 (patch)
tree53f969ce0d0200fa909e3515474bb38b0f902018
parentf7f00fb15b3caff66112d77f1c60f78888235cec (diff)
downloadsystemd-1acacd737b2a831e7cce4049d42df254718a4543.tar.gz
test-execute: fix killing of unit processes
Let's use the correct wrapper for calling unit vtable functions. Let's make sure we always use the right wrappers, and never bypass them needlessly. Moreover use SIGKILL rather than "9" as signal name. Let's not be needlessly cryptic. Follow-up for: f7f8e8cbb953686c520969a66a9718675a972af5
-rw-r--r--src/test/test-execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 0e378f68c0..18a021dcea 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -54,7 +54,7 @@ static void check(Manager *m, Unit *unit, int status_expected, int code_expected
n = now(CLOCK_MONOTONIC);
if (ts + timeout < n) {
log_error("Test timeout when testing %s", unit->id);
- r = UNIT_VTABLE(unit)->kill(unit, KILL_ALL, 9, NULL);
+ r = unit_kill(unit, KILL_ALL, SIGKILL, NULL);
if (r < 0)
log_error_errno(r, "Failed to kill %s: %m", unit->id);
exit(EXIT_FAILURE);