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

test: wipe journal files after test 

Otherwise they accumulate and create noise.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-03-20 17:46:04 +01:00
parent b74a306197
commit eb1290ef35
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/TEST-02-CRYPTSETUP/test.sh
View File

@ -15,6 +15,7 @@ check_result_qemu() {
cryptsetup luksOpen ${LOOPDEV}p2 varcrypt <$TESTDIR/keyfile
mount /dev/mapper/varcrypt $initdir/var
cp -a $initdir/var/log/journal $TESTDIR
rm -r $initdir/var/log/journal/*
umount $initdir/var
umount $initdir
cryptsetup luksClose /dev/mapper/varcrypt

2
test/TEST-24-UNIT-TESTS/test.sh
View File

@ -23,6 +23,7 @@ check_result_nspawn() {
fi
fi
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
rm -r $TESTDIR/$1/var/log/journal/*
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
umount_initdir
return $_ret
@ -47,6 +48,7 @@ check_result_qemu() {
fi
fi
cp -a $initdir/var/log/journal $TESTDIR
rm -r $initdir/var/log/journal/*
umount_initdir
[[ -n "$TIMED_OUT" ]] && _ret=$(($_ret+1))
return $_ret

2
test/test-functions
View File

@ -776,6 +776,7 @@ check_result_nspawn() {
[[ -e $TESTDIR/$1/testok ]] && ret=0
[[ -f $TESTDIR/$1/failed ]] && cp -a $TESTDIR/$1/failed $TESTDIR
cp -a $TESTDIR/$1/var/log/journal $TESTDIR
rm -r $TESTDIR/$1/var/log/journal/*
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
ls -l $TESTDIR/journal/*/*.journal
test -s $TESTDIR/failed && ret=$(($ret+1))
@ -792,6 +793,7 @@ check_result_qemu() {
[[ -e $initdir/testok ]] && ret=0
[[ -f $initdir/failed ]] && cp -a $initdir/failed $TESTDIR
cp -a $initdir/var/log/journal $TESTDIR
rm -r $initdir/var/log/journal/*
check_asan_reports "$initdir" || ret=$(($ret+1))
umount $initdir
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed