From 57130ca01be6cf31eeded5bd03ae41a28866bd26 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Thu, 1 Jun 2023 09:07:28 +0200 Subject: [PATCH] test: make TEST-04 stable once again Wait a bit if necessary for the cursor file to appear. Follow-up fb35feae97. --- test/units/testsuite-04.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh index 4af619941b..a207070492 100755 --- a/test/units/testsuite-04.sh +++ b/test/units/testsuite-04.sh @@ -163,15 +163,15 @@ set -o pipefail # https://github.com/systemd/systemd/issues/26746 rm -f /tmp/issue-26746-log /tmp/issue-26746-cursor -ID=$(systemd-id128 new) +ID="$(systemd-id128 new)" journalctl -t "$ID" --follow --cursor-file=/tmp/issue-26746-cursor | tee /tmp/issue-26746-log & systemd-cat -t "$ID" /bin/sh -c 'echo hogehoge' # shellcheck disable=SC2016 timeout 10 bash -c 'while ! [[ -f /tmp/issue-26746-log && "$(cat /tmp/issue-26746-log)" =~ hogehoge ]]; do sleep .5; done' pkill -TERM journalctl -test -f /tmp/issue-26746-cursor -CURSOR_FROM_FILE=$(cat /tmp/issue-26746-cursor) -CURSOR_FROM_JOURNAL=$(journalctl -t "$ID" --output export MESSAGE=hogehoge | sed -n -e '/__CURSOR=/ { s/__CURSOR=//; p }') +timeout 10 bash -c 'while ! test -f /tmp/issue-26746-cursor; do sleep .5; done' +CURSOR_FROM_FILE="$(cat /tmp/issue-26746-cursor)" +CURSOR_FROM_JOURNAL="$(journalctl -t "$ID" --output=export MESSAGE=hogehoge | sed -n -e '/__CURSOR=/ { s/__CURSOR=//; p }')" test "$CURSOR_FROM_FILE" = "$CURSOR_FROM_JOURNAL" add_logs_filtering_override() { -- 2.25.1