test: clean up test artifacts

So we don't run into unexpected fails when two tests use the same paths.

diff --git a/test/units/testsuite-23.RuntimeDirectoryPreserve.sh b/test/units/testsuite-23.RuntimeDirectoryPreserve.sh
index b60b612d82f637391389aa7c12be8ac141270777..ca57702cf1421652b347fce83a8f9fc931a4843f 100755 (executable)
--- a/test/units/testsuite-23.RuntimeDirectoryPreserve.sh
+++ b/test/units/testsuite-23.RuntimeDirectoryPreserve.sh
@@ -7,6 +7,14 @@ set -o pipefail
 
 # Test RuntimeDirectoryPreserve=yes
 
+at_exit() {
+    set +e
+
+    rm -fr /run/hoge /tmp/aaa
+}
+
+trap at_exit EXIT
+
 systemd-mount -p RuntimeDirectory=hoge -p RuntimeDirectoryPreserve=yes -t tmpfs tmpfs /tmp/aaa
 
 touch /run/hoge/foo

diff --git a/test/units/testsuite-23.clean-unit.sh b/test/units/testsuite-23.clean-unit.sh
index 81f180a1e27cc0435baafbd80e1f9eeff6789ed7..a82b54fe9e286cacc4962d56dd7495206d8ede85 100755 (executable)
--- a/test/units/testsuite-23.clean-unit.sh
+++ b/test/units/testsuite-23.clean-unit.sh
@@ -7,6 +7,17 @@ set -o pipefail
 
 # Test unit configuration/state/cache/log/runtime data cleanup
 
+at_exit() {
+    set +e
+
+    rm -fr /{etc,run,var/lib,var/cache,var/log}/test-service
+    rm -fr /{etc,run,var/lib,var/cache,var/log}/private/test-service
+    rm -fr /{etc,run,var/lib,var/cache,var/log}/hoge
+    rm -fr /{etc,run,var/lib,var/cache,var/log}/test-socket
+}
+
+trap at_exit EXIT
+
 cat >/run/systemd/system/test-service.service <<EOF
 [Service]
 ConfigurationDirectory=test-service