diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-21 23:38:28 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-03-21 23:38:28 -0400 |
| commit | c4b3e434a7f08a904ac60d4285c668e40bcdb69a (patch) | |
| tree | 5c233d6942d9306f1d5a34d68984dc0517329e11 /src | |
| parent | 85d8f87e242378aa847d6498d98fb977c5c08213 (diff) | |
| parent | 34f5ff465fc63c46aa2aa2f10465286c2ddde6a1 (diff) | |
Merge pull request #2879 from ronnychevalier/rc/test_execute_fix
test-execute: fix execution of AmbientCapabilities tests
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test-execute.c | 5 |
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 |