From 18f8c5d4661195ac142d4e9554982ffbbe3b199e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 29 Apr 2019 12:54:26 +0200 Subject: [PATCH] test-execute: check exit code before exit status The meaning of the status changes depending on the code, hence let's always compare the code first, status second. --- src/test/test-execute.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 9f1cb0ca38..a27de296a4 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -62,18 +62,20 @@ static void check(const char *func, Manager *m, Unit *unit, int status_expected, } } exec_status_dump(&service->main_exec_status, stdout, "\t"); - if (service->main_exec_status.status != status_expected) { - log_error("%s: %s: exit status %d, expected %d", - func, unit->id, - service->main_exec_status.status, status_expected); - abort(); - } + if (service->main_exec_status.code != code_expected) { log_error("%s: %s: exit code %d, expected %d", func, unit->id, service->main_exec_status.code, code_expected); abort(); } + + if (service->main_exec_status.status != status_expected) { + log_error("%s: %s: exit status %d, expected %d", + func, unit->id, + service->main_exec_status.status, status_expected); + abort(); + } } static bool check_nobody_user_and_group(void) {