diff options
| author | Michael Biebl <biebl@debian.org> | 2017-10-10 00:22:57 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-10-10 00:22:57 +0200 |
| commit | f5e65279187b6aa0c0c5a00b14dca9eab441ffb2 (patch) | |
| tree | b834735b2b8fabf24499bb8cc12d4f24870436f7 /test/TEST-02-CRYPTSETUP | |
| parent | 81c583552ee1c3355cdef1b11a33737dd98e6971 (diff) | |
| download | systemd-f5e65279187b6aa0c0c5a00b14dca9eab441ffb2.tar.gz | |
New upstream version 235
Diffstat (limited to 'test/TEST-02-CRYPTSETUP')
| -rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index aea0fc53f6..1280148b58 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -1,7 +1,9 @@ #!/bin/bash # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- # ex: ts=8 sw=4 sts=4 et filetype=sh +set -e TEST_DESCRIPTION="cryptsetup systemd setup" +TEST_NO_NSPAWN=1 . $TEST_BASE_DIR/test-functions @@ -24,15 +26,6 @@ check_result_qemu() { } -test_run() { - if run_qemu; then - check_result_qemu || return 1 - else - dwarn "can't run QEMU, skipping" - fi - return 0 -} - test_setup() { create_empty_image echo -n test >$TESTDIR/keyfile @@ -86,9 +79,9 @@ EOF } test_cleanup() { - umount $TESTDIR/root/var 2>/dev/null + [ -d $TESTDIR/root/var ] && mountpoint $TESTDIR/root/var && umount $TESTDIR/root/var [[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt - umount $TESTDIR/root 2>/dev/null + umount $TESTDIR/root 2>/dev/null || true [[ $LOOPDEV ]] && losetup -d $LOOPDEV return 0 } |