|
 |
594167 |
From 37b398e2a3d6cd225a3121843540a033f4415b80 Mon Sep 17 00:00:00 2001
|
|
|
594167 |
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
|
594167 |
Date: Fri, 17 Jun 2022 17:29:22 +0200
|
|
|
594167 |
Subject: [PATCH] test: check journal directly instead of capturing console
|
|
|
594167 |
output
|
|
|
594167 |
|
|
|
594167 |
(cherry picked from commit 8cda7b91ff267fc21325d4886980e243389a7566)
|
|
|
594167 |
|
|
|
594167 |
Related: #2087652
|
|
|
594167 |
---
|
|
|
594167 |
test/TEST-52-HONORFIRSTSHUTDOWN/test.sh | 13 ++++---------
|
|
|
594167 |
1 file changed, 4 insertions(+), 9 deletions(-)
|
|
|
594167 |
|
|
|
594167 |
diff --git a/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh b/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh
|
|
|
594167 |
index 936e801c51..6a1ec9ca29 100755
|
|
|
594167 |
--- a/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh
|
|
|
594167 |
+++ b/test/TEST-52-HONORFIRSTSHUTDOWN/test.sh
|
|
|
594167 |
@@ -14,15 +14,10 @@ TEST_NO_QEMU=1
|
|
|
594167 |
# could turn into a reboot if the test fails.
|
|
|
594167 |
NSPAWN_TIMEOUT=60
|
|
|
594167 |
|
|
|
594167 |
-# Remove this file if it exists. This is used along with
|
|
|
594167 |
-# the make target "finish". Since concrete confirmation is
|
|
|
594167 |
-# only found from the console during the poweroff.
|
|
|
594167 |
-rm -f /tmp/honorfirstshutdown.log >/dev/null
|
|
|
594167 |
-
|
|
|
594167 |
check_result_nspawn_hook() {
|
|
|
594167 |
- grep -q "Shutdown is already active. Skipping emergency action request" /tmp/honorfirstshutdown.log
|
|
|
594167 |
+ local workspace="${1:?}"
|
|
|
594167 |
+
|
|
|
594167 |
+ "${JOURNALCTL:?}" -D "${workspace:?}/var/log/journal" --grep "Shutdown is already active. Skipping emergency action request" --no-pager
|
|
|
594167 |
}
|
|
|
594167 |
|
|
|
594167 |
-# Note: don't use a pipe in the following expression, as it breaks the trap
|
|
|
594167 |
-# handlers we have defined in test/test-functions.
|
|
|
594167 |
-do_test "$@" > >(tee /tmp/honorfirstshutdown.log)
|
|
|
594167 |
+do_test "$@"
|