dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: add testcase for 'journalctl --follow --cursor-file='

Browse Source 
Also, add a FIXME comment to illustrate the issue uncovered after by
7a4ee86161.
This commit is contained in:
Yu Watanabe
2023-05-27 06:12:09 +09:00
parent 24d633e438
commit fb35feae97
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/units/testsuite-04.sh
View File

@@ -161,6 +161,26 @@ journalctl --follow --file=/var/log/journal/*/* | head -n1 | grep .
journalctl --follow --merge | head -n1 | grep . journalctl --follow --merge | head -n1 | grep .
set -o pipefail set -o pipefail
# https://github.com/systemd/systemd/issues/26746
rm -f /tmp/issue-26746-log /tmp/issue-26746-cursor
ID=$(systemd-id128 new)
# FIXME:
# After the commit 7a4ee861615101ddd2f95056cf30e69e41da86ce,
# journalctl --follow does not work if no matching entry stored in the journal.
# To workaround the issue, we need to add an entry before calling journalctl below.
systemd-cat -t "$ID" /bin/sh -c 'echo aaa'
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 }')
test "$CURSOR_FROM_FILE" = "$CURSOR_FROM_JOURNAL"
add_logs_filtering_override() { add_logs_filtering_override() {
local unit="${1:?}" local unit="${1:?}"
local override_name="${2:?}" local override_name="${2:?}"