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

Provides coverage for #24565.
2023-05-19 20:03:34 +02:00
parent e47622a61c
commit c11c50a53f
1 changed files with 5 additions and 1 deletions
@@ -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:?}"