From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 20 Mar 2020 16:46:04 +0000 (+0100)
Subject: test: wipe journal files after test
X-Git-Tag: v246-rc1~682^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb1290ef35af93eebb73e6f0769031382011e8ca;p=thirdparty%2Fsystemd.git

test: wipe journal files after test

Otherwise they accumulate and create noise.
---

diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh
index 3e3414b6381..c6e6b7e6496 100755
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-02-CRYPTSETUP/test.sh
@@ -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
diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-24-UNIT-TESTS/test.sh
index 0475621623b..5ce8d85433b 100755
--- a/test/TEST-24-UNIT-TESTS/test.sh
+++ b/test/TEST-24-UNIT-TESTS/test.sh
@@ -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
diff --git a/test/test-functions b/test/test-functions
index 7c3e074c333..ebdcfaea668 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -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