diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-06-17 17:29:22 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2022-06-17 17:32:41 +0200 |
| commit | 8cda7b91ff267fc21325d4886980e243389a7566 (patch) | |
| tree | 290d24616e8e7244485ab26f16a27bb0bcbc57a5 /test/TEST-52-HONORFIRSTSHUTDOWN/test.sh | |
| parent | 35d2d2e61c7695b87a4ee3dc54d065f4de95f260 (diff) | |
| download | systemd-8cda7b91ff267fc21325d4886980e243389a7566.tar.gz | |
test: check journal directly instead of capturing console output
Diffstat (limited to 'test/TEST-52-HONORFIRSTSHUTDOWN/test.sh')
| -rwxr-xr-x | test/TEST-52-HONORFIRSTSHUTDOWN/test.sh | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh b/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh index 936e801c51..6a1ec9ca29 100755 --- a/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh +++ b/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh @@ -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 "$@" |