shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00
Code

test: redirect stdout/stderr of TEST-04-JOURNAL to console as well

Browse Source 
This effectively reverts fa6f37c043 just for TEST-04, as we nuke the
journal repeatedly in this test which makes it particularly hard to
debug. Let's hope the issue behind fa6f37c043 won't bite us back in this
case.

Follow-up for: fa6f37c043
Reverts: 8f7c876bdc

(cherry picked from commit b3ed0808d198901bf35c872276858db4e2ba8cd6)
This commit is contained in:
Frantisek Sumsal 2023-12-23 15:35:26 +01:00 committed by Luca Boccassi
parent 73b49bda78
commit 2c9e1ae02a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/TEST-04-JOURNAL/test.sh
View File

@ -9,6 +9,7 @@ TEST_DESCRIPTION="Journal-related tests"
test_append_files() {
local workspace="${1:?}"
local dropin_dir
mkdir -p "$workspace/test-journals/"
cp -av "${TEST_BASE_DIR:?}/test-journals/"* "$workspace/test-journals/"
@ -18,6 +19,14 @@ test_append_files() {
# Necessary for RH-based systems, otherwise MHD fails with:
# microhttpd: Failed to initialise TLS session.
image_install -o /etc/crypto-policies/back-ends/gnutls.config
# Since we nuke the journal repeatedly during this test, let's redirect
# stdout/stderr to the console as well to make the test a bit more debug-able.
if ! get_bool "${INTERACTIVE_DEBUG:-}"; then
dropin_dir="${workspace:?}/etc/systemd/system/testsuite-04.service.d/"
mkdir -p "$dropin_dir"
printf '[Service]\nStandardOutput=journal+console\nStandardError=journal+console' >"$dropin_dir/99-stdout.conf"
fi
}
do_test "$@"

8
test/units/testsuite-04.bsod.sh
View File

@ -22,9 +22,6 @@ at_exit() {
journalctl --flush
fi
rm -f /run/systemd/journald.conf.d/99-forward-to-console.conf
systemctl restart systemd-journald
return 0
}
@ -52,12 +49,7 @@ vcs_dump_and_check() {
# current boot, let's temporarily overmount /var/log/journal with a tmpfs,
# as we're going to wipe it multiple times, but we need to keep the original
# journal intact for the other tests to work correctly.
#
# Also, since we'll eventually lose the journal from this test, let's temporarily
# forward everything to console, to make potential fails debug-able.
trap at_exit EXIT
mkdir -p /run/systemd/journald.conf.d/
echo -ne '[Journal]\nForwardToConsole=yes' >/run/systemd/journald.conf.d/99-forward-to-console.conf
mount -t tmpfs tmpfs /var/log/journal
systemctl restart systemd-journald