From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 29 Apr 2019 10:54:26 +0000 (+0200)
Subject: test-execute: check exit code before exit status
X-Git-Tag: v243~499^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18f8c5d4661195ac142d4e9554982ffbbe3b199e;p=platform%2Fupstream%2Fsystemd.git

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.
---

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 9f1cb0ca..a27de29 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) {