From: Ronny Chevalier <chevalier.ronny@gmail.com>
Date: Mon, 21 Mar 2016 17:40:07 +0000 (+0100)
Subject: test-execute: fix execution of AmbientCapabilities tests
X-Git-Tag: v230~245^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2879%2Fhead;p=thirdparty%2Fsystemd.git

test-execute: fix execution of AmbientCapabilities tests

Wrong tests were executed
---

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 3e91a5601ef..901cc44af6d 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -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