summaryrefslogtreecommitdiff
path: root/src/test/test-execute.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-03-26 12:01:00 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-03-26 18:53:53 +0100
commit9ca58284756a4e10fd7913741f24ab3e3cc0f161 (patch)
tree009f7c24ebcaa1151aa7b1362c6c8788c40ef028 /src/test/test-execute.c
parent6aed6a11577b108b9a39f26aeae5e45d98f20c90 (diff)
downloadsystemd-9ca58284756a4e10fd7913741f24ab3e3cc0f161.tar.gz
test-execute: skip flaky test when we can't unshare namespaces
When running in Fedora "mock", / is a tmpfs and /home is not mounted. The test assumes that /home will be a tmpfs only and only if we can unshare. Obviously, this does not hold in this case, because unsharing is not possible, but /home is still a tmpfs. Let's just skip the test, since it's fully legitimate to mount either or both of / and /home as tmpfs.
Diffstat (limited to 'src/test/test-execute.c')
-rw-r--r--src/test/test-execute.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 9fd909df6a..9f1cb0ca38 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -280,7 +280,12 @@ static void test_exec_privatedevices(Manager *m) {
}
static void test_exec_protecthome(Manager *m) {
- test(__func__, m, "exec-protecthome-tmpfs-vs-protectsystem-strict.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED);
+ if (!can_unshare) {
+ log_notice("Cannot reliably unshare, skipping %s", __func__);
+ return;
+ }
+
+ test(__func__, m, "exec-protecthome-tmpfs-vs-protectsystem-strict.service", 0, CLD_EXITED);
}
static void test_exec_protectkernelmodules(Manager *m) {