summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorRonny Chevalier <chevalier.ronny@gmail.com>2016-03-21 18:40:07 +0100
committerRonny Chevalier <chevalier.ronny@gmail.com>2016-03-21 18:48:12 +0100
commit34f5ff465fc63c46aa2aa2f10465286c2ddde6a1 (patch)
tree1f8aae910631bca6374f972209d019b650ba79cb /src/test
parentMerge pull request #2878 from martinpitt/master (diff)
downloadsystemd-34f5ff465fc63c46aa2aa2f10465286c2ddde6a1.tar.xz
systemd-34f5ff465fc63c46aa2aa2f10465286c2ddde6a1.zip
test-execute: fix execution of AmbientCapabilities tests
Wrong tests were executed
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-execute.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 3e91a5601e..901cc44af6 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