From 9ca58284756a4e10fd7913741f24ab3e3cc0f161 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 26 Mar 2019 12:01:00 +0100 Subject: [PATCH] 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. --- src/test/test-execute.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 9fd909df6ab..9f1cb0ca389 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) { -- 2.47.3