shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-31 17:17:43 +03:00
Code

test: check journal directly instead of capturing console output

Browse Source
This commit is contained in:
Frantisek Sumsal 2022-06-17 17:29:22 +02:00
parent 35d2d2e61c
commit 8cda7b91ff
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/TEST-52-HONORFIRSTSHUTDOWN/test.sh
View File

@ -14,15 +14,10 @@ TEST_NO_QEMU=1
# could turn into a reboot if the test fails.
NSPAWN_TIMEOUT=60
# Remove this file if it exists. This is used along with
# the make target "finish". Since concrete confirmation is
# only found from the console during the poweroff.
rm -f /tmp/honorfirstshutdown.log >/dev/null
check_result_nspawn_hook() {
grep -q "Shutdown is already active. Skipping emergency action request" /tmp/honorfirstshutdown.log
local workspace="${1:?}"
"${JOURNALCTL:?}" -D "${workspace:?}/var/log/journal" --grep "Shutdown is already active. Skipping emergency action request" --no-pager
}
# Note: don't use a pipe in the following expression, as it breaks the trap
# handlers we have defined in test/test-functions.
do_test "$@" > >(tee /tmp/honorfirstshutdown.log)
do_test "$@"