Merge pull request #30604 from mrc0mmand/test-journal-shenanigans

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

diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index 7f1c460d471d98cd579a02624197bb0605712c81..42574ce8ea7cfecf782f179132f0359efa1c95df 100755 (executable)
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -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 "$@"

diff --git a/test/units/testsuite-04.bsod.sh b/test/units/testsuite-04.bsod.sh
index 1d4ad7ec6a21a48761b8ab93c90d05af068d6edc..30f0cb0bd4813751cc6d903dd7a411e789b88537 100755 (executable)
--- a/test/units/testsuite-04.bsod.sh
+++ b/test/units/testsuite-04.bsod.sh
@@ -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
 

diff --git a/test/units/testsuite-04.sh b/test/units/testsuite-04.sh
index 2a8f7972e407ce2e6068d35b50f40be323a1ff6d..9c2a033aa98d17ce1517bf42cf30c31c187ab0ea 100755 (executable)
--- a/test/units/testsuite-04.sh
+++ b/test/units/testsuite-04.sh
@@ -3,9 +3,6 @@
 set -eux
 set -o pipefail
 
-# Limit the maximum journal size
-trap "journalctl --rotate --vacuum-size=20M" EXIT
-
 # shellcheck source=test/units/test-control.sh
 . "$(dirname "$0")"/test-control.sh