From: Yu Watanabe Date: Thu, 10 May 2018 14:17:50 +0000 (+0900) Subject: test-execute: remove state directories before running tests X-Git-Tag: v239~277 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c5873096e77b7ba9724b545f1e7cc0c43c3fd9c;p=thirdparty%2Fsystemd.git test-execute: remove state directories before running tests Fixes #8679. --- diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 9b0fac8bc98..730dfd1e0b8 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -431,8 +431,14 @@ static void test_exec_dynamicuser(Manager *m) { test(m, "exec-dynamicuser-supplementarygroups.service", 0, CLD_EXITED); test(m, "exec-dynamicuser-statedir.service", 0, CLD_EXITED); + (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/private/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); + (void) rm_rf("/var/lib/private/test-dynamicuser-migrate2", REMOVE_ROOT|REMOVE_PHYSICAL); + test(m, "exec-dynamicuser-statedir-migrate-step1.service", 0, CLD_EXITED); test(m, "exec-dynamicuser-statedir-migrate-step2.service", 0, CLD_EXITED); + (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/private/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); diff --git a/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service b/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service index 5a61228c9f7..edb0be7ef80 100644 --- a/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service +++ b/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service @@ -1,5 +1,5 @@ [Unit] -Description=Test DynamicUser= migrate StateDirectory= (preparation) +Description=Test DynamicUser= migrate StateDirectory= [Service] ExecStart=test -w /var/lib/test-dynamicuser-migrate