From: Frantisek Sumsal Date: Wed, 26 Apr 2023 12:56:47 +0000 (+0200) Subject: test: clean up the test script a bit X-Git-Tag: v254-rc1~586^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de965f48934325e6fc564720aa318f24c315caec;p=thirdparty%2Fsystemd.git test: clean up the test script a bit --- diff --git a/test/test-journals/1/system.journal.zst b/test/test-journals/no-rtc/system.journal.zst similarity index 100% rename from test/test-journals/1/system.journal.zst rename to test/test-journals/no-rtc/system.journal.zst diff --git a/test/test-journals/1/system@0005ebbfd42fc981-39a8842ec948769a.journal~.zst b/test/test-journals/no-rtc/system@0005ebbfd42fc981-39a8842ec948769a.journal~.zst similarity index 100% rename from test/test-journals/1/system@0005ebbfd42fc981-39a8842ec948769a.journal~.zst rename to test/test-journals/no-rtc/system@0005ebbfd42fc981-39a8842ec948769a.journal~.zst diff --git a/test/test-journals/1/system@0005ebbfd4346b9f-43185b46162d9fa5.journal~.zst b/test/test-journals/no-rtc/system@0005ebbfd4346b9f-43185b46162d9fa5.journal~.zst similarity index 100% rename from test/test-journals/1/system@0005ebbfd4346b9f-43185b46162d9fa5.journal~.zst rename to test/test-journals/no-rtc/system@0005ebbfd4346b9f-43185b46162d9fa5.journal~.zst diff --git a/test/test-journals/1/system@0005ebbfd4385848-2e5dff5354ab9bcf.journal~.zst b/test/test-journals/no-rtc/system@0005ebbfd4385848-2e5dff5354ab9bcf.journal~.zst similarity index 100% rename from test/test-journals/1/system@0005ebbfd4385848-2e5dff5354ab9bcf.journal~.zst rename to test/test-journals/no-rtc/system@0005ebbfd4385848-2e5dff5354ab9bcf.journal~.zst diff --git a/test/test-journals/1/user-1000.journal.zst b/test/test-journals/no-rtc/user-1000.journal.zst similarity index 100% rename from test/test-journals/1/user-1000.journal.zst rename to test/test-journals/no-rtc/user-1000.journal.zst diff --git a/test/test-journals/1/user-1000@0005ebbfd660bcbe-dbef2eee11f4b575.journal~.zst b/test/test-journals/no-rtc/user-1000@0005ebbfd660bcbe-dbef2eee11f4b575.journal~.zst similarity index 100% rename from test/test-journals/1/user-1000@0005ebbfd660bcbe-dbef2eee11f4b575.journal~.zst rename to test/test-journals/no-rtc/user-1000@0005ebbfd660bcbe-dbef2eee11f4b575.journal~.zst diff --git a/test/test-journals/1/user-1000@0005ebbfe89faec4-a5e890e7b00bedd1.journal~.zst b/test/test-journals/no-rtc/user-1000@0005ebbfe89faec4-a5e890e7b00bedd1.journal~.zst similarity index 100% rename from test/test-journals/1/user-1000@0005ebbfe89faec4-a5e890e7b00bedd1.journal~.zst rename to test/test-journals/no-rtc/user-1000@0005ebbfe89faec4-a5e890e7b00bedd1.journal~.zst diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh index 2a9b67949c3..8bab2bf9f15 100755 --- a/test/units/testsuite-04.sh +++ b/test/units/testsuite-04.sh @@ -272,20 +272,19 @@ journalctl --sync SEQNUM2=$(journalctl -o export -n 1 | grep -Ea "^__SEQNUM=" | cut -d= -f2) test "$SEQNUM2" -gt "$SEQNUM1" -JTMP="/var/tmp/jtmp-$RANDOM" -mkdir "$JTMP" - -( cd /test-journals/1 && for f in *.zst; do unzstd "$f" -o "$JTMP/${f%.zst}"; done ) - -journalctl --directory="$JTMP" --list-boots --output=json >/tmp/lb1 - +# Test for journals without RTC +# See: https://github.com/systemd/systemd/issues/662 +JOURNAL_DIR="$(mktemp -d)" +while read -r file; do + filename="${file##*/}" + unzstd "$file" -o "$JOURNAL_DIR/${filename%*.zst}" +done < <(find /test-journals/no-rtc -name "*.zst") + +journalctl --directory="$JOURNAL_DIR" --list-boots --output=json >/tmp/lb1 diff -u /tmp/lb1 - <<'EOF' [{"index":-3,"boot_id":"5ea5fc4f82a14186b5332a788ef9435e","first_entry":1666569600994371,"last_entry":1666584266223608},{"index":-2,"boot_id":"bea6864f21ad4c9594c04a99d89948b0","first_entry":1666584266731785,"last_entry":1666584347230411},{"index":-1,"boot_id":"4c708e1fd0744336be16f3931aa861fb","first_entry":1666584348378271,"last_entry":1666584354649355},{"index":0,"boot_id":"35e8501129134edd9df5267c49f744a4","first_entry":1666584356661527,"last_entry":1666584438086856}] EOF - -rm -rf "$JTMP" - -rm /tmp/lb1 +rm -rf "$JOURNAL_DIR" /tmp/lb1 # https://bugzilla.redhat.com/show_bug.cgi?id=2183546 mkdir /run/systemd/system/systemd-journald.service.d