From f593965161c04644b9ddd7959916eb863b883264 Mon Sep 17 00:00:00 2001 From: Topi Miettinen Date: Wed, 16 Sep 2020 14:09:55 +0300 Subject: [PATCH] test-execute: kill Waldo and Quux Retire /var/lib{,/private}/{quux,waldo} after they have served their purpose. --- src/test/test-execute.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test-execute.c b/src/test/test-execute.c index b5b93b5283..f10e32b5b9 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -578,10 +578,14 @@ static void test_exec_dynamicuser(Manager *m) { test(__func__, m, "exec-dynamicuser-supplementarygroups.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); test(__func__, m, "exec-dynamicuser-statedir.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + (void) rm_rf("/var/lib/quux", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/test-dynamicuser-migrate2", REMOVE_ROOT|REMOVE_PHYSICAL); + (void) rm_rf("/var/lib/waldo", REMOVE_ROOT|REMOVE_PHYSICAL); + (void) rm_rf("/var/lib/private/quux", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/private/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/private/test-dynamicuser-migrate2", REMOVE_ROOT|REMOVE_PHYSICAL); + (void) rm_rf("/var/lib/private/waldo", REMOVE_ROOT|REMOVE_PHYSICAL); test(__func__, m, "exec-dynamicuser-statedir-migrate-step1.service", 0, CLD_EXITED); test(__func__, m, "exec-dynamicuser-statedir-migrate-step2.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED);