summaryrefslogtreecommitdiffstats
path: root/test/TEST-02-CRYPTSETUP
diff options
context:
space:
mode:
authorDan Streetman <ddstreet@canonical.com>2019-07-12 20:09:48 +0200
committerDan Streetman <ddstreet@canonical.com>2019-07-17 00:05:15 +0200
commitf85bc044e5c2d862d86b9dd0fcef5e8aa2928f06 (patch)
treed90bbfe6195da87085fc082f647c8651bbc016c7 /test/TEST-02-CRYPTSETUP
parenttest: add create_empty_image_rootdir() to simplify testcase setup (diff)
downloadsystemd-f85bc044e5c2d862d86b9dd0fcef5e8aa2928f06.tar.xz
systemd-f85bc044e5c2d862d86b9dd0fcef5e8aa2928f06.zip
test: ignore errors during test cleanup, so cleanup can finish
Also move TESTDIR and STATEFILE removal into test_cleanup
Diffstat (limited to 'test/TEST-02-CRYPTSETUP')
-rwxr-xr-xtest/TEST-02-CRYPTSETUP/test.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
index e28cec0340..2dd2cce6e5 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -83,7 +83,8 @@ cleanup_root_var() {
}
test_cleanup() {
- cleanup_root_var
+ # ignore errors, so cleanup can continue
+ cleanup_root_var || true
_test_cleanup
}