picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/test-functions: avoid stderr noise, only umount on cleanup if mountpoint 

Only umount it during cleanup if the $TESTDIR/root dir is a mountpoint.
This avoids adding noise to the stderr log such as:

mountpoint: /var/tmp/systemd-test.waLOFT/root: No such file or directory
This commit is contained in:
Dan Streetman 2019-08-13 07:50:59 -04:00
parent 3a2acd9ee0
commit 9e19a8b028
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/test-functions
View File

@ -1668,12 +1668,16 @@ setup_suse() {
inst_simple "/usr/lib/systemd/system/haveged.service"
}
_umount_dir() {
if mountpoint -q $1; then
ddebug "umount $1"
umount $1
fi
}
_test_setup_cleanup() {
# only umount if create_empty_image_rootdir() was called to mount it
if [[ $TEST_SETUP_CLEANUP_ROOTDIR ]]; then
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root
fi
[[ -z $TEST_SETUP_CLEANUP_ROOTDIR ]] || _umount_dir $TESTDIR/root
}
# can be overridden in specific test
@ -1685,10 +1689,7 @@ _test_cleanup() {
# (post-test) cleanup should always ignore failure and cleanup as much as possible
(
set +e
if mountpoint $TESTDIR/root; then
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root
fi
_umount_dir $TESTDIR/root
if [[ $LOOPDEV && -b $LOOPDEV ]]; then
ddebug "losetup -d $LOOPDEV"
losetup -d $LOOPDEV