]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-execute: fix execution of AmbientCapabilities tests 2879/head
authorRonny Chevalier <chevalier.ronny@gmail.com>
Mon, 21 Mar 2016 17:40:07 +0000 (18:40 +0100)
committerRonny Chevalier <chevalier.ronny@gmail.com>
Mon, 21 Mar 2016 17:48:12 +0000 (18:48 +0100)
Wrong tests were executed

src/test/test-execute.c

index 3e91a5601ef0ab2fa8d4011cb68acb80f403efc3..901cc44af6d284d9598ea927fdb5c379d5776189 100644 (file)
@@ -252,10 +252,11 @@ static void test_exec_capabilityambientset(Manager *m) {
         r = prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_CLEAR_ALL, 0, 0, 0);
         if (r >= 0 || errno != EINVAL) {
                 if (getpwnam("nobody")) {
-                        test(m, "exec-runtimedirectory-owner.service", 0, CLD_EXITED);
-                } else if (getpwnam("nfsnobody")) {
                         test(m, "exec-capabilityambientset.service", 0, CLD_EXITED);
                         test(m, "exec-capabilityambientset-merge.service", 0, CLD_EXITED);
+                } else if (getpwnam("nfsnobody")) {
+                        test(m, "exec-capabilityambientset-nfsnobody.service", 0, CLD_EXITED);
+                        test(m, "exec-capabilityambientset-merge-nfsnobody.service", 0, CLD_EXITED);
                 } else
                         log_error_errno(errno, "Skipping test_exec_capabilityambientset, could not find nobody/nfsnobody user: %m");
         } else