From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 24 Sep 2025 15:46:35 +0000 (+0900)
Subject: integration tests: do not adjust log level in the test script
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c60d3011feac20dcc3c66fe2bcafa0a889e33d1;p=thirdparty%2Fsystemd.git

integration tests: do not adjust log level in the test script

We passes log level through kernel command line. It is not necessary to
set to debug level at the beginning, and set to info at the end.
This is important when a test has several subtests. If a subtest sets
log level to info at the end, then subsequent tests may not generate any
useful logs.
---

diff --git a/test/units/TEST-07-PID1.poll-limit.sh b/test/units/TEST-07-PID1.poll-limit.sh
index ca988b2321d..f7ccc3f8952 100755
--- a/test/units/TEST-07-PID1.poll-limit.sh
+++ b/test/units/TEST-07-PID1.poll-limit.sh
@@ -3,8 +3,6 @@
 set -eux
 set -o pipefail
 
-systemd-analyze log-level debug
-
 cat >/run/systemd/system/floodme@.service <<EOF
 [Service]
 ExecStart=true
diff --git a/test/units/TEST-07-PID1.quota.sh b/test/units/TEST-07-PID1.quota.sh
index a68d9dd53d4..7b93268afa1 100755
--- a/test/units/TEST-07-PID1.quota.sh
+++ b/test/units/TEST-07-PID1.quota.sh
@@ -4,8 +4,6 @@
 set -eux
 set -o pipefail
 
-systemd-analyze log-level debug
-
 test_quotas() {
 
     local directory="$1"
@@ -90,6 +88,4 @@ EOF
 
 test_quotas "/var/lib/private" "StateDirectory=quotadir" "StateDirectoryQuota=1%"
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-13-NSPAWN.importctl.sh b/test/units/TEST-13-NSPAWN.importctl.sh
index 080b42625cb..7eae005f85c 100755
--- a/test/units/TEST-13-NSPAWN.importctl.sh
+++ b/test/units/TEST-13-NSPAWN.importctl.sh
@@ -20,8 +20,6 @@ at_exit() {
 
 trap at_exit EXIT
 
-systemctl service-log-level systemd-importd debug
-
 # Mount tmpfs over /var/lib/confexts to not pollute the image
 mkdir -p /var/lib/confexts
 mount -t tmpfs tmpfs /var/lib/confexts -o mode=755
diff --git a/test/units/TEST-13-NSPAWN.machined.sh b/test/units/TEST-13-NSPAWN.machined.sh
index d93b3f0441f..add54288289 100755
--- a/test/units/TEST-13-NSPAWN.machined.sh
+++ b/test/units/TEST-13-NSPAWN.machined.sh
@@ -20,8 +20,6 @@ at_exit() {
 
 trap at_exit EXIT
 
-systemctl service-log-level systemd-machined debug
-systemctl service-log-level systemd-importd debug
 # per request in https://github.com/systemd/systemd/pull/35117
 systemctl edit --runtime --stdin 'systemd-nspawn@.service' --drop-in=debug.conf <<EOF
 [Service]
diff --git a/test/units/TEST-19-CGROUP.ExitType-cgroup.sh b/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
index 65c260639af..fd861904d47 100755
--- a/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
+++ b/test/units/TEST-19-CGROUP.ExitType-cgroup.sh
@@ -11,8 +11,6 @@ if [[ "$(get_cgroup_hierarchy)" != unified ]]; then
     exit 0
 fi
 
-systemd-analyze log-level debug
-
 # Multiple level process tree, parent process stays up
 cat >/tmp/test19-exit-cgroup.sh <<EOF
 #!/usr/bin/env bash
@@ -98,6 +96,3 @@ systemd-run --wait \
             --property="Type=notify" \
             --property="ExitType=cgroup" \
             /tmp/test19-exit-cgroup-parentless.sh 'systemctl kill --signal 9 six'
-
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.ExecReload.sh b/test/units/TEST-23-UNIT-FILE.ExecReload.sh
index ae16871ffc1..f2f492edbf8 100755
--- a/test/units/TEST-23-UNIT-FILE.ExecReload.sh
+++ b/test/units/TEST-23-UNIT-FILE.ExecReload.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 # Test ExecReload= (PR #13098)
 
-systemd-analyze log-level debug
-
 export SYSTEMD_PAGER=
 SERVICE_PATH="$(mktemp /etc/systemd/system/execreloadXXX.service)"
 SERVICE_NAME="${SERVICE_PATH##*/}"
@@ -57,5 +55,3 @@ systemctl status "$SERVICE_NAME"
 systemctl reload "$SERVICE_NAME"
 systemctl status "$SERVICE_NAME"
 systemctl stop "$SERVICE_NAME"
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.ExecStopPost.sh b/test/units/TEST-23-UNIT-FILE.ExecStopPost.sh
index 8d9fa670fd5..f20af1a1418 100755
--- a/test/units/TEST-23-UNIT-FILE.ExecStopPost.sh
+++ b/test/units/TEST-23-UNIT-FILE.ExecStopPost.sh
@@ -4,8 +4,6 @@ set -eux
 
 # Test that ExecStopPost= is always run
 
-systemd-analyze log-level debug
-
 systemd-run --unit=simple1.service --wait -p StandardOutput=tty -p StandardError=tty -p Type=simple \
     -p ExecStopPost='touch /run/simple1' true
 test -f /run/simple1
@@ -101,5 +99,3 @@ test -f /run/idle1
 (! systemd-run --unit=idle2.service --wait -p StandardOutput=tty -p StandardError=tty -p Type=idle \
     -p ExecStopPost='touch /run/idle2' false)
 test -f /run/idle2
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh b/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh
index ddeeb854bca..12efaf15dcb 100755
--- a/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh
+++ b/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh
@@ -18,8 +18,6 @@ mkdir /tmp/test-extra-fd
 echo "Hello" > /tmp/test-extra-fd/1.txt
 echo "Extra" > /tmp/test-extra-fd/2.txt
 
-systemd-analyze log-level debug
-
 # Open files and assign FD to variables
 exec {TEST_FD1}</tmp/test-extra-fd/1.txt
 exec {TEST_FD2}</tmp/test-extra-fd/2.txt
@@ -61,5 +59,3 @@ assert_eq "$(systemctl show -P Result "$TEST_UNIT")" "success"
 assert_eq "$(systemctl show -P ExecMainStatus "$TEST_UNIT")" "0"
 
 systemctl stop "$TEST_UNIT"
-
-systemctl log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh b/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh
index 4fd68d8b848..1d27a24d8b5 100755
--- a/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh
+++ b/test/units/TEST-23-UNIT-FILE.JoinsNamespaceOf.sh
@@ -6,9 +6,6 @@ set -o pipefail
 
 # Test JoinsNamespaceOf= with PrivateTmp=yes
 
-systemd-analyze log-level debug
-systemd-analyze log-target journal
-
 # simple case
 systemctl start TEST-23-UNIT-FILE-joins-namespace-of-1.service
 systemctl start TEST-23-UNIT-FILE-joins-namespace-of-2.service
@@ -27,5 +24,3 @@ systemctl start TEST-23-UNIT-FILE-joins-namespace-of-8.service
 systemctl start TEST-23-UNIT-FILE-joins-namespace-of-9.service
 systemctl stop TEST-23-UNIT-FILE-joins-namespace-of-6.service
 systemctl stop TEST-23-UNIT-FILE-joins-namespace-of-8.service
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.StandardOutput.sh b/test/units/TEST-23-UNIT-FILE.StandardOutput.sh
index a951b13b465..ec01e990be6 100755
--- a/test/units/TEST-23-UNIT-FILE.StandardOutput.sh
+++ b/test/units/TEST-23-UNIT-FILE.StandardOutput.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 # Test StandardOutput=file:
 
-systemd-analyze log-level debug
-
 systemd-run --wait --unit=TEST-23-UNIT-FILE-standard-output-one \
             -p StandardOutput=file:/tmp/stdout \
             -p StandardError=file:/tmp/stderr \
@@ -56,5 +54,3 @@ EOF
 cmp /tmp/stderr <<EOF
 b
 EOF
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.Upholds.sh b/test/units/TEST-23-UNIT-FILE.Upholds.sh
index b1fe897a43c..c62b33baa4b 100755
--- a/test/units/TEST-23-UNIT-FILE.Upholds.sh
+++ b/test/units/TEST-23-UNIT-FILE.Upholds.sh
@@ -6,9 +6,6 @@ set -o pipefail
 
 # Test OnSuccess= + Uphold= + PropagatesStopTo= + BindsTo=
 
-systemd-analyze log-level debug
-systemd-analyze log-target journal
-
 # Idea is this:
 #    1. we start TEST-23-UNIT-FILE-success.service
 #    2. which through OnSuccess= starts TEST-23-UNIT-FILE-fail.service,
@@ -102,5 +99,3 @@ for _ in {1..120}; do
     fi
 done
 [[ "$sigrtmin1" == 1 ]]
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.exec-command-ex.sh b/test/units/TEST-23-UNIT-FILE.exec-command-ex.sh
index 756d24848bb..48f419271a8 100755
--- a/test/units/TEST-23-UNIT-FILE.exec-command-ex.sh
+++ b/test/units/TEST-23-UNIT-FILE.exec-command-ex.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 # Test ExecXYZEx= service unit dbus hookups
 
-systemd-analyze log-level debug
-
 declare -A property
 
 property[1_one]=ExecCondition
@@ -31,5 +29,3 @@ for c in "${!property[@]}"; do
     systemctl show -p "${property[$c]}" "$c" | grep -F "path=echo ; argv[]=echo \${$c} ; ignore_errors=no"
     systemctl show -p "${property[$c]}Ex" "$c" | grep -F "path=echo ; argv[]=echo \${$c} ; flags=no-env-expand"
 done
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.oneshot-restart.sh b/test/units/TEST-23-UNIT-FILE.oneshot-restart.sh
index 9d2760ee8b7..5e82641e5a4 100755
--- a/test/units/TEST-23-UNIT-FILE.oneshot-restart.sh
+++ b/test/units/TEST-23-UNIT-FILE.oneshot-restart.sh
@@ -11,8 +11,6 @@ set -o pipefail
 # wait this many secs for each test service to succeed in what is being tested
 MAX_SECS=60
 
-systemctl log-level debug
-
 # test one: Restart=on-failure should restart the service
 (! systemd-run --unit=oneshot-restart-one -p Type=oneshot -p Restart=on-failure bash -c "exit 1")
 
@@ -97,5 +95,3 @@ EOF
 
 systemctl disable "$UNIT_NAME"
 rm "$TMP_FILE" /run/systemd/system/{"$UNIT_NAME","$ONSUCCESS_UNIT_NAME"} "$FIFO_FILE"
-
-systemctl log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.openfile.sh b/test/units/TEST-23-UNIT-FILE.openfile.sh
index 0e2e22a01d2..2e8b9d9f542 100755
--- a/test/units/TEST-23-UNIT-FILE.openfile.sh
+++ b/test/units/TEST-23-UNIT-FILE.openfile.sh
@@ -14,8 +14,6 @@ at_exit() {
 
 trap at_exit EXIT
 
-systemctl log-level debug
-
 # Existing files
 
 mkdir /tmp/test-open-file
@@ -51,5 +49,3 @@ systemctl stop TEST-23-UNIT-FILE-openfile-server.socket
 
 assert_rc 202 systemd-run -p OpenFile=/run/missing/foo:missing-file:read-only --wait true
 assert_rc 0 systemd-run -p OpenFile=/run/missing/foo:missing-file:read-only,graceful --wait true
-
-systemctl log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.success-failure.sh b/test/units/TEST-23-UNIT-FILE.success-failure.sh
index 8fc9596cc57..14276cc7726 100755
--- a/test/units/TEST-23-UNIT-FILE.success-failure.sh
+++ b/test/units/TEST-23-UNIT-FILE.success-failure.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 # Test OnSuccess=/OnFailure= in combination
 
-systemd-analyze log-level debug
-
 # Start-up should fail, but the automatic restart should fix it
 (! systemctl start success-failure-test )
 
@@ -45,5 +43,3 @@ done
 test "$(systemctl is-active success-failure-test-failure)" = "inactive"
 
 systemctl stop success-failure-test success-failure-test-success
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-23-UNIT-FILE.type-exec.sh b/test/units/TEST-23-UNIT-FILE.type-exec.sh
index d5497efff2a..be877d771ec 100755
--- a/test/units/TEST-23-UNIT-FILE.type-exec.sh
+++ b/test/units/TEST-23-UNIT-FILE.type-exec.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 # Test Type=exec
 
-systemd-analyze log-level debug
-
 # Create a binary for which execve() will fail
 touch /tmp/brokenbinary
 chmod +x /tmp/brokenbinary
@@ -59,5 +57,3 @@ busctl call \
         sleep 0         true \
         sleep 2 sleep 1 true \
     0)
-
-systemd-analyze log-level info
diff --git a/test/units/TEST-30-ONCLOCKCHANGE.sh b/test/units/TEST-30-ONCLOCKCHANGE.sh
index bf796a2c002..ecb6ed0a91f 100755
--- a/test/units/TEST-30-ONCLOCKCHANGE.sh
+++ b/test/units/TEST-30-ONCLOCKCHANGE.sh
@@ -3,8 +3,6 @@
 set -eux
 set -o pipefail
 
-systemd-analyze log-level debug
-
 systemctl disable --now systemd-timesyncd.service
 
 timedatectl set-timezone Europe/Berlin
@@ -61,6 +59,4 @@ while test ! -f /tmp/timezone-changed-alternate-path-2 ; do sleep .5 ; done
 rm /run/systemd/system.conf /run/systemd/system/systemd-timedated.service.d/override.conf
 systemctl daemon-reload
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-32-OOMPOLICY.sh b/test/units/TEST-32-OOMPOLICY.sh
index 046b8b95458..bb8823c1ad1 100755
--- a/test/units/TEST-32-OOMPOLICY.sh
+++ b/test/units/TEST-32-OOMPOLICY.sh
@@ -10,8 +10,6 @@ set -o pipefail
 # kernels where the concept was still new.
 
 if test -f /sys/fs/cgroup/system.slice/TEST-32-OOMPOLICY.service/memory.oom.group; then
-    systemd-analyze log-level debug
-
     # Run a service that is guaranteed to be the first candidate for OOM killing
     systemd-run --unit=oomtest.service \
                 -p Type=exec -p OOMScoreAdjust=1000 -p OOMPolicy=stop -p MemoryAccounting=yes \
@@ -29,8 +27,6 @@ if test -f /sys/fs/cgroup/system.slice/TEST-32-OOMPOLICY.service/memory.oom.grou
 
     RESULT="$(systemctl show -P Result oomtest.service)"
     test "$RESULT" = "oom-kill"
-
-    systemd-analyze log-level info
 fi
 
 touch /testok
diff --git a/test/units/TEST-34-DYNAMICUSERMIGRATE.sh b/test/units/TEST-34-DYNAMICUSERMIGRATE.sh
index 05d645c35ef..e89c012dd37 100755
--- a/test/units/TEST-34-DYNAMICUSERMIGRATE.sh
+++ b/test/units/TEST-34-DYNAMICUSERMIGRATE.sh
@@ -3,8 +3,6 @@
 set -eux
 set -o pipefail
 
-systemd-analyze log-level debug
-
 test_directory() {
     local directory="$1"
     local path="$2"
@@ -239,6 +237,4 @@ if systemd-analyze compare-versions "$(uname -r)" ge 5.12; then
     test_check_idmapped_mounts_root
 fi
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-36-NUMAPOLICY.sh b/test/units/TEST-36-NUMAPOLICY.sh
index fcd3d6dd894..7e48b4739ef 100755
--- a/test/units/TEST-36-NUMAPOLICY.sh
+++ b/test/units/TEST-36-NUMAPOLICY.sh
@@ -21,9 +21,6 @@ at_exit() {
 
 trap at_exit EXIT
 
-systemd-analyze log-level debug
-systemd-analyze log-target journal
-
 # Log files
 straceLog='strace.log'
 journalLog='journal.log'
@@ -352,6 +349,4 @@ fi
 rm -rf "$confDir"
 systemctl daemon-reload
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-38-FREEZER.sh b/test/units/TEST-38-FREEZER.sh
index 31f28c9ef12..5b1920dfb42 100755
--- a/test/units/TEST-38-FREEZER.sh
+++ b/test/units/TEST-38-FREEZER.sh
@@ -12,8 +12,6 @@ if [[ -n "${COVERAGE_BUILD_DIR:-}" ]]; then
     exit 77
 fi
 
-systemd-analyze log-level debug
-
 unit=TEST-38-FREEZER-sleep.service
 
 start_test_service() {
diff --git a/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh b/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh
index 0805a5caf94..b28df65fe57 100755
--- a/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh
+++ b/test/units/TEST-43-PRIVATEUSER-UNPRIV.sh
@@ -13,13 +13,9 @@ fi
 
 install_extension_images
 
-systemd-analyze log-level debug
-
 runas testuser systemd-run --wait --user --unit=test-private-users \
     -p PrivateUsers=yes -P echo hello
 
-runas testuser systemctl --user log-level debug
-
 runas testuser systemd-run --wait --user --unit=test-private-tmp-innerfile \
     -p PrivateTmp=yes \
     -P touch /tmp/innerfile.txt
@@ -140,6 +136,4 @@ if unshare --mount --user --map-root-user mount -t overlay overlay /tmp/c -o low
         grep PORTABLE_PREFIXES=app1 /usr/lib/extension-release.d/extension-release.app2
 fi
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-44-LOG-NAMESPACE.sh b/test/units/TEST-44-LOG-NAMESPACE.sh
index 0819a4b8433..0b214c93785 100755
--- a/test/units/TEST-44-LOG-NAMESPACE.sh
+++ b/test/units/TEST-44-LOG-NAMESPACE.sh
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 set -eux
 
-systemd-analyze log-level debug
-
 journalctl --list-namespaces -o json | jq .
 
 systemd-run --wait -p LogNamespace=foobar echo "hello world"
@@ -25,6 +23,4 @@ journalctl --list-namespaces -o json | jq .
 grep "^hello world$" /tmp/hello-world
 (! grep "^hello world$" /tmp/no-hello-world)
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-46-HOMED.sh b/test/units/TEST-46-HOMED.sh
index b18a6c11f87..15a53b18f75 100755
--- a/test/units/TEST-46-HOMED.sh
+++ b/test/units/TEST-46-HOMED.sh
@@ -40,9 +40,6 @@ FSTYPE="$(stat --file-system --format "%T" /)"
 
 systemctl start systemd-homed.service systemd-userdbd.socket
 
-systemd-analyze log-level debug
-systemctl service-log-level systemd-homed debug
-
 # Create a tmpfs to use as backing store for the home dir. That way we can enforce a size limit nicely.
 mkdir -p /home
 mount -t tmpfs tmpfs /home -o size=290M
@@ -848,6 +845,4 @@ homectl inspect matchtest
 homectl inspect matchtest | grep "Area: quux3"
 homectl remove matchtest
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-52-HONORFIRSTSHUTDOWN.sh b/test/units/TEST-52-HONORFIRSTSHUTDOWN.sh
index 16ff507d0d2..05c42ef72d4 100755
--- a/test/units/TEST-52-HONORFIRSTSHUTDOWN.sh
+++ b/test/units/TEST-52-HONORFIRSTSHUTDOWN.sh
@@ -3,8 +3,6 @@
 set -ex
 set -o pipefail
 
-systemd-analyze log-level debug
-
 systemctl enable test-honor-first-shutdown.service
 systemctl start test-honor-first-shutdown.service
 
diff --git a/test/units/TEST-54-CREDS.sh b/test/units/TEST-54-CREDS.sh
index d349b0f3e45..b549745e0d4 100755
--- a/test/units/TEST-54-CREDS.sh
+++ b/test/units/TEST-54-CREDS.sh
@@ -6,8 +6,6 @@ set -eux
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-systemd-analyze log-level debug
-
 run_with_cred_compare() (
     local cred="${1:?}"
     local exp="${2?}"
@@ -529,6 +527,4 @@ run0 -u testuser --pipe mkdir -p /home/testuser/.config/credstore.encrypted
 run0 -u testuser --pipe systemd-creds encrypt --user --name=brummbaer - /home/testuser/.config/credstore.encrypted/brummbaer < /tmp/brummbaer.data
 run0 -u testuser --pipe systemd-run --user --pipe -p ImportCredential=brummbaer systemd-creds cat brummbaer | cmp /tmp/brummbaer.data
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-55-OOMD.sh b/test/units/TEST-55-OOMD.sh
index a28c6856a54..90d40069f74 100755
--- a/test/units/TEST-55-OOMD.sh
+++ b/test/units/TEST-55-OOMD.sh
@@ -8,8 +8,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-systemd-analyze log-level debug
-
 # Ensure that the init.scope.d drop-in is applied on boot
 test "$(cat /sys/fs/cgroup/init.scope/memory.high)" != "max"
 
@@ -346,6 +344,4 @@ EOF
 
 run_testcases
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-59-RELOADING-RESTART.sh b/test/units/TEST-59-RELOADING-RESTART.sh
index 7f79052cbb2..6600bd054dc 100755
--- a/test/units/TEST-59-RELOADING-RESTART.sh
+++ b/test/units/TEST-59-RELOADING-RESTART.sh
@@ -3,11 +3,6 @@
 set -eux
 set -o pipefail
 
-fail() {
-    systemd-analyze log-level info
-    exit 1
-}
-
 # Wait for a service to enter a state within a timeout period, if it doesn't
 # enter the desired state within the timeout period then this function will
 # exit the test case with a non zero exit code.
@@ -27,9 +22,6 @@ wait_on_state_or_fail() {
     done
 }
 
-systemd-analyze log-level debug
-
-
 cat >/run/systemd/system/testservice-fail-59.service <<EOF
 [Unit]
 Description=TEST-59-RELOADING-RESTART Normal exit
@@ -83,8 +75,6 @@ systemctl start testservice-abort-restart-59.service
 systemctl --signal=SIGABRT kill testservice-abort-restart-59.service
 wait_on_state_or_fail "testservice-abort-restart-59.service" "failed" "30"
 
-systemd-analyze log-level info
-
 # Test that rate-limiting daemon-reload works
 mkdir -p /run/systemd/system.conf.d/
 cat >/run/systemd/system.conf.d/50-test-59-reload.conf <<EOF
@@ -152,8 +142,6 @@ EOF
 
 chmod +x /run/notify-reload-test.sh
 
-systemd-analyze log-level debug
-
 systemd-run --unit notify-reload-test -p Type=notify-reload -p KillMode=process /run/notify-reload-test.sh
 systemctl reload notify-reload-test
 systemctl stop notify-reload-test
@@ -163,8 +151,6 @@ test "$(systemctl show -p ExecMainStatus --value notify-reload-test)" = 109
 systemctl reset-failed notify-reload-test
 rm /run/notify-reload-test.sh
 
-systemd-analyze log-level info
-
 # Ensure that, with system log level info, we get debug level messages when a unit fails to start and is
 # restarted with RestartMode=debug
 cat >/run/systemd/system/testservice-fail-restart-debug-59.service <<EOF
diff --git a/test/units/TEST-60-MOUNT-RATELIMIT.sh b/test/units/TEST-60-MOUNT-RATELIMIT.sh
index d91e22225e1..77d4899f87e 100755
--- a/test/units/TEST-60-MOUNT-RATELIMIT.sh
+++ b/test/units/TEST-60-MOUNT-RATELIMIT.sh
@@ -168,9 +168,6 @@ testcase_mount_ratelimit() {
     timeout 2m bash -c 'while systemctl list-units -t mount tmp-meow* | grep -q tmp-meow; do systemctl daemon-reload; sleep 10; done'
 }
 
-systemd-analyze log-level debug
-systemd-analyze log-target journal
-
 mkdir -p /run/systemd/journald.conf.d
 cat >/run/systemd/journald.conf.d/99-ratelimit.conf <<EOF
 [Journal]
diff --git a/test/units/TEST-62-RESTRICT-IFACES.sh b/test/units/TEST-62-RESTRICT-IFACES.sh
index 35ab862f321..0c6a566d99a 100755
--- a/test/units/TEST-62-RESTRICT-IFACES.sh
+++ b/test/units/TEST-62-RESTRICT-IFACES.sh
@@ -4,8 +4,6 @@ set -ex
 set -o pipefail
 
 setup() {
-    systemd-analyze log-level debug
-
     for i in {0..3};
     do
         ip netns del "ns${i}" || true
@@ -30,8 +28,6 @@ teardown() {
         ip netns del "ns${i}"
         ip link del "veth${i}"
     done
-
-    systemd-analyze log-level info
 }
 
 if systemd-analyze compare-versions "$(uname -r)" lt 5.7; then
diff --git a/test/units/TEST-63-PATH.sh b/test/units/TEST-63-PATH.sh
index cdd323cba65..fa58ff382c0 100755
--- a/test/units/TEST-63-PATH.sh
+++ b/test/units/TEST-63-PATH.sh
@@ -6,8 +6,6 @@ set -o pipefail
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-systemctl log-level debug
-
 # Test that a path unit continuously triggering a service that fails condition checks eventually fails with
 # the trigger-limit-hit error.
 rm -f /tmp/nonexistent
@@ -120,6 +118,4 @@ echo test2 > /tmp/copyme
 exec {lock}<&-
 timeout 30 bash -c 'until diff /tmp/copyme /tmp/copied >/dev/null; do sleep .2; done'
 
-systemctl log-level info
-
 touch /testok
diff --git a/test/units/TEST-65-ANALYZE.sh b/test/units/TEST-65-ANALYZE.sh
index 233b79951a1..e391b765a3e 100755
--- a/test/units/TEST-65-ANALYZE.sh
+++ b/test/units/TEST-65-ANALYZE.sh
@@ -6,7 +6,6 @@ set -eux
 # shellcheck source=test/units/util.sh
 . "$(dirname "$0")"/util.sh
 
-systemctl log-level debug
 export SYSTEMD_LOG_LEVEL=debug
 
 # Sanity checks
@@ -1147,6 +1146,4 @@ MAIN_PID=$(systemctl show -p MainPID --value "$UNIT_NAME")
 OUTPUT=$(systemd-analyze unit-shell "$UNIT_NAME" cat /tmp/testfile)
 assert_in "Hello from test unit" "$OUTPUT"
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-66-DEVICE-ISOLATION.sh b/test/units/TEST-66-DEVICE-ISOLATION.sh
index ccdfcb274c1..eb954e3bb5c 100755
--- a/test/units/TEST-66-DEVICE-ISOLATION.sh
+++ b/test/units/TEST-66-DEVICE-ISOLATION.sh
@@ -5,8 +5,6 @@ set -o pipefail
 
 RESULTS_FILE=/tmp/TEST-66-DEVICE-ISOLATION.serviceresults
 
-systemd-analyze log-level debug
-
 systemctl start TEST-66-DEVICE-ISOLATION-device-isolation.service
 
 sleep 5
@@ -19,6 +17,4 @@ systemctl stop TEST-66-DEVICE-ISOLATION-device-isolation.service
 
 grep -q "thisshouldnotbehere" "$RESULTS_FILE" && exit 42
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-68-PROPAGATE-EXIT-STATUS.sh b/test/units/TEST-68-PROPAGATE-EXIT-STATUS.sh
index 70743b78df1..d8fa4a4cba9 100755
--- a/test/units/TEST-68-PROPAGATE-EXIT-STATUS.sh
+++ b/test/units/TEST-68-PROPAGATE-EXIT-STATUS.sh
@@ -14,7 +14,6 @@ wait_on_state_or_fail() {
     state=$(systemctl show "$service" --property=ActiveState --value)
     while [ "$state" != "$expected_state" ]; do
         if [ "$timeout" = "0" ]; then
-            systemd-analyze log-level info
             exit 1
         fi
         timeout=$((timeout - 1))
@@ -23,8 +22,6 @@ wait_on_state_or_fail() {
     done
 }
 
-systemd-analyze log-level debug
-
 cat >/run/systemd/system/testservice-failure-68.service <<EOF
 [Unit]
 OnFailure=testservice-failure-exit-handler-68.service
@@ -226,6 +223,4 @@ wait_on_state_or_fail "testservice-failure-exit-handler-68-template@testservice-
 systemctl start testservice-success-and-failure-68.service
 wait_on_state_or_fail "testservice-success-exit-handler-68.service" "inactive" "10"
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-75-RESOLVED.sh b/test/units/TEST-75-RESOLVED.sh
index 5e4fa064716..cabd389f3cc 100755
--- a/test/units/TEST-75-RESOLVED.sh
+++ b/test/units/TEST-75-RESOLVED.sh
@@ -70,7 +70,6 @@ restart_resolved() {
     # and can occasionally hit the default rate limit
     systemctl reset-failed systemd-resolved.service
     systemctl start systemd-resolved.service
-    systemctl service-log-level systemd-resolved.service debug
 }
 
 setup() {
@@ -1440,7 +1439,6 @@ EOF
 # PRE-SETUP
 systemctl unmask systemd-resolved.service
 systemctl enable --now systemd-resolved.service
-systemctl service-log-level systemd-resolved.service debug
 
 # Need to be run before SETUP, otherwise things will break
 manual_testcase_01_resolvectl
diff --git a/test/units/TEST-78-SIGQUEUE.sh b/test/units/TEST-78-SIGQUEUE.sh
index 46afd3c4316..552d61bb21b 100755
--- a/test/units/TEST-78-SIGQUEUE.sh
+++ b/test/units/TEST-78-SIGQUEUE.sh
@@ -9,8 +9,6 @@ if ! env --block-signal=SIGUSR1 true 2> /dev/null ; then
     exit 0
 fi
 
-systemd-analyze log-level debug
-
 UNIT="test-sigqueue-$RANDOM.service"
 
 systemd-run -u "$UNIT" -p Type=notify -p DynamicUser=1 -- env --block-signal=SIGRTMIN+7 systemd-notify --exec --ready \; sleep infinity
@@ -30,6 +28,4 @@ test "$(grep SigQ: /proc/"$P"/status | cut -d: -f2 | cut -d/ -f1)" -eq 6
 
 systemctl stop $UNIT
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-79-MEMPRESS.sh b/test/units/TEST-79-MEMPRESS.sh
index 0cf5c37416e..06591609668 100755
--- a/test/units/TEST-79-MEMPRESS.sh
+++ b/test/units/TEST-79-MEMPRESS.sh
@@ -13,8 +13,6 @@ if ! cat /proc/pressure/memory >/dev/null ; then
     exit 0
 fi
 
-systemd-analyze log-level debug
-
 CGROUP=/sys/fs/cgroup/"$(systemctl show TEST-79-MEMPRESS.service -P ControlGroup)"
 test -d "$CGROUP"
 
@@ -63,6 +61,4 @@ systemd-run \
 
 rm "$SCRIPT"
 
-systemd-analyze log-level info
-
 touch /testok
diff --git a/test/units/TEST-80-NOTIFYACCESS.sh b/test/units/TEST-80-NOTIFYACCESS.sh
index 355f6e7e307..a8ecd9fa709 100755
--- a/test/units/TEST-80-NOTIFYACCESS.sh
+++ b/test/units/TEST-80-NOTIFYACCESS.sh
@@ -98,8 +98,6 @@ systemd-analyze fdstore "$MYUNIT" --json=short | grep -P -q '\[{"fdname":"quux",
 systemctl stop "$MYUNIT"
 rm "$MYSCRIPT"
 
-systemd-analyze log-level debug
-
 # Test fdstore pinning (this will pull in fdstore-pin.service fdstore-nopin.service)
 systemctl start fdstore-pin.target
 
diff --git a/test/units/TEST-82-SOFTREBOOT.sh b/test/units/TEST-82-SOFTREBOOT.sh
index 9d6a93f8e8e..274e54a1178 100755
--- a/test/units/TEST-82-SOFTREBOOT.sh
+++ b/test/units/TEST-82-SOFTREBOOT.sh
@@ -71,8 +71,6 @@ check_device_property() {
     assert_eq "$count" "$expected_count"
 }
 
-systemd-analyze log-level debug
-
 export SYSTEMD_LOG_LEVEL=debug
 
 if [ -f /run/TEST-82-SOFTREBOOT.touch3 ]; then
@@ -325,7 +323,5 @@ EOF
     exec sleep infinity
 fi
 
-systemd-analyze log-level info
-
 touch /testok
 systemctl --no-block exit 123
diff --git a/test/units/TEST-87-AUX-UTILS-VM.pstore.sh b/test/units/TEST-87-AUX-UTILS-VM.pstore.sh
index 043d0238565..be5297fa52d 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.pstore.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.pstore.sh
@@ -3,8 +3,6 @@
 set -eux
 set -o pipefail
 
-systemctl log-level info
-
 (! systemd-detect-virt -cq)
 
 DUMMY_DMESG_0="$(mktemp)"