test: wipe journal files after test
Otherwise they accumulate and create noise.
This commit is contained in:
parent
b74a306197
commit
eb1290ef35
|
@ -15,6 +15,7 @@ check_result_qemu() {
|
||||||
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
|
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
|
||||||
mount /dev/mapper/varcrypt $initdir/var
|
mount /dev/mapper/varcrypt $initdir/var
|
||||||
cp -a $initdir/var/log/journal $TESTDIR
|
cp -a $initdir/var/log/journal $TESTDIR
|
||||||
|
rm -r $initdir/var/log/journal/*
|
||||||
umount $initdir/var
|
umount $initdir/var
|
||||||
umount $initdir
|
umount $initdir
|
||||||
cryptsetup luksClose /dev/mapper/varcrypt
|
cryptsetup luksClose /dev/mapper/varcrypt
|
||||||
|
|
|
@ -23,6 +23,7 @@ check_result_nspawn() {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
|
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
|
||||||
|
rm -r $TESTDIR/$1/var/log/journal/*
|
||||||
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
|
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
|
||||||
umount_initdir
|
umount_initdir
|
||||||
return $_ret
|
return $_ret
|
||||||
|
@ -47,6 +48,7 @@ check_result_qemu() {
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
cp -a $initdir/var/log/journal $TESTDIR
|
cp -a $initdir/var/log/journal $TESTDIR
|
||||||
|
rm -r $initdir/var/log/journal/*
|
||||||
umount_initdir
|
umount_initdir
|
||||||
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
|
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
|
||||||
return $_ret
|
return $_ret
|
||||||
|
|
|
@ -776,6 +776,7 @@ check_result_nspawn() {
|
||||||
[[ -e $TESTDIR/$1/testok ]] && ret=0
|
[[ -e $TESTDIR/$1/testok ]] && ret=0
|
||||||
[[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR
|
[[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR
|
||||||
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
|
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
|
||||||
|
rm -r $TESTDIR/$1/var/log/journal/*
|
||||||
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
||||||
ls -l $TESTDIR/journal/*/*.journal
|
ls -l $TESTDIR/journal/*/*.journal
|
||||||
test -s $TESTDIR/failed && ret=$(($ret+1))
|
test -s $TESTDIR/failed && ret=$(($ret+1))
|
||||||
|
@ -792,6 +793,7 @@ check_result_qemu() {
|
||||||
[[ -e $initdir/testok ]] && ret=0
|
[[ -e $initdir/testok ]] && ret=0
|
||||||
[[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
|
[[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
|
||||||
cp -a $initdir/var/log/journal $TESTDIR
|
cp -a $initdir/var/log/journal $TESTDIR
|
||||||
|
rm -r $initdir/var/log/journal/*
|
||||||
check_asan_reports "$initdir" || ret=$(($ret+1))
|
check_asan_reports "$initdir" || ret=$(($ret+1))
|
||||||
umount $initdir
|
umount $initdir
|
||||||
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
||||||
|
|
Loading…
Reference in a new issue