diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-04-25 20:57:27 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2021-04-26 19:24:47 +0200 |
| commit | 9abef4b1b4a57bf8f440770efe7c13dcf9032367 (patch) | |
| tree | 5ef5d2d7671554c8c0608330429792d365eb0687 /test/TEST-52-HONORFIRSTSHUTDOWN/test.sh | |
| parent | 6695c41c31063f64de1204c8a247d33edd10599a (diff) | |
| download | systemd-9abef4b1b4a57bf8f440770efe7c13dcf9032367.tar.gz | |
test: reorganize the TEST-52 a bit
Diffstat (limited to 'test/TEST-52-HONORFIRSTSHUTDOWN/test.sh')
| -rwxr-xr-x | test/TEST-52-HONORFIRSTSHUTDOWN/test.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh b/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh index 3bcf1b8c9e..41c7e91917 100755 --- a/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh +++ b/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh @@ -18,4 +18,10 @@ NSPAWN_TIMEOUT=20 # only found from the console during the poweroff. rm -f /tmp/honorfirstshutdown.log >/dev/null -do_test "$@" 52 >/tmp/honorfirstshutdown.log +check_result_nspawn_hook() { + grep -q "Shutdown is already active. Skipping emergency action request" /tmp/honorfirstshutdown.log +} + +# 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) |