test: check if we can use --merge with --follow

Provides coverage for #24565.

diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh
index 3c4c8afd53888bd9f51bdace2f4450d9b63b77d1..6ed41f24ea51fb277c6b40378b994f3ab92a41d1 100755 (executable)
--- a/test/units/testsuite-04.sh
+++ b/test/units/testsuite-04.sh
@@ -154,8 +154,12 @@ sleep 3
 [[ ! -f "/tmp/i-lose-my-logs" ]]
 systemctl stop forever-print-hola
 
+set +o pipefail
 # https://github.com/systemd/systemd/issues/15528
-journalctl --follow --file=/var/log/journal/*/* | head -n1 || [[ $? -eq 1 ]]
+journalctl --follow --file=/var/log/journal/*/* | head -n1 | grep .
+# https://github.com/systemd/systemd/issues/24565
+journalctl --follow --merge | head -n1 | grep .
+set -o pipefail
 
 add_logs_filtering_override() {
     local unit="${1:?}"