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

Similar to 5c60d3011f, but for udevd.
This commit is contained in:
Yu Watanabe
2026-01-08 11:30:19 +09:00
committed by Zbigniew Jędrzejewski-Szmek
parent 04f05d9bd7
commit 18de7dd90f
12 changed files with 5 additions and 37 deletions

View File

@@ -3,8 +3,6 @@
set -ex
set -o pipefail
udevadm control --log-level=debug
IFNAME=test-udev-aaa
ip link add "$IFNAME" type dummy
IFINDEX=$(ip -json link show "$IFNAME" | jq '.[].ifindex')
@@ -17,6 +15,4 @@ udevadm wait --timeout=10 --removed --settle "/sys/class/net/$IFNAME"
# CHeck if the database file is removed.
[[ ! -e "/run/udev/data/n$IFINDEX" ]]
udevadm control --log-level=info
exit 0

View File

@@ -19,14 +19,10 @@ at_exit() (
systemctl daemon-reload
[[ -d "$TMPDIR" ]] && rm -rf "$TMPDIR"
udevadm control --log-level=info
)
trap at_exit EXIT
udevadm control --log-level=debug
TMPDIR="$(mktemp -d)"
truncate -s 16M "$TMPDIR"/foo.raw
mkfs.ext4 -L foo "$TMPDIR"/foo.raw

View File

@@ -6,8 +6,6 @@ set -o pipefail
# shellcheck source=test/units/util.sh
. "$(dirname "$0")"/util.sh
udevadm control --log-level=debug
mkdir -p /run/systemd/network/
cat >/run/systemd/network/10-test.link <<EOF
[Match]
@@ -198,6 +196,6 @@ ip link del dev test1
rm -f /run/systemd/network/10-test.link
rm -rf /run/systemd/network/10-test.link.d
udevadm control --reload --log-level=info
udevadm control --reload
exit 0

View File

@@ -11,14 +11,10 @@ at_exit() (
set +e
[[ -d "$TMPDIR" ]] && rm -rf "$TMPDIR"
udevadm control --log-level=info
)
trap at_exit EXIT
udevadm control --log-level=debug
TMPDIR="$(mktemp -d)"
truncate -s 16M "$TMPDIR"/foo.raw
mkfs.ext4 "$TMPDIR"/foo.raw

View File

@@ -15,7 +15,7 @@ OriginalName=testif
Name=te!st!if
EOF
udevadm control --log-level=debug --reload
udevadm control --reload
# Check if any interfaces originally named with '!' in their name have been renamed unexpectedly.
ip link add 'hoge!foo' type dummy
@@ -41,6 +41,6 @@ ip link del dev 'te!st!if'
# cleanup
rm -f /run/systemd/network/10-rename-test.link
udevadm control --log-level=info --reload
udevadm control --reload
exit 0

View File

@@ -22,8 +22,6 @@ EOF
udevadm control --reload
}
udevadm control --log-level=debug
create_link_file test1
ip link add address 00:50:56:c0:00:18 type dummy
udevadm wait --settle --timeout=30 /sys/class/net/test1
@@ -81,6 +79,6 @@ assert_not_in "altname hoge" "$output"
ip link del dev test3
rm -f /run/systemd/network/10-test.link
udevadm control --reload --log-level=info
udevadm control --reload
exit 0

View File

@@ -24,7 +24,7 @@ ACTION=="add", RUN+="/usr/bin/bash -c ':> /tmp/marker'", RUN+="/usr/bin/sleep 10
LABEL="end"
EOF
udevadm control --reload --log-level=debug
udevadm control --reload
udevadm settle --timeout 30
rm -f /tmp/marker

View File

@@ -80,10 +80,6 @@ cat >/run/udev/rules.d/50-testsuite.rules <<EOF
ACTION=="add", SUBSYSTEM=="block", KERNEL=="sda", OPTIONS:="watch"
EOF
# To make the previous invocation of systemd-udevd generates debugging logs on stop,
# that will be checked by check().
udevadm control --log-level debug
# Unfortunately, journalctl --invocation= is unstable when debug logging is enabled on service manager.
SAVED_LOG_LEVEL=$(systemctl log-level)
systemctl log-level info

View File

@@ -29,9 +29,6 @@ EOF
systemctl daemon-reexec
udevadm control --log-level debug
ARGS=()
STATE_DIRECTORY=/var/lib/private/
if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then

View File

@@ -118,8 +118,6 @@ else
exit 1
fi
udevadm control --log-level=debug
IMAGE_DIR="$(mktemp -d --tmpdir="" TEST-50-IMAGES.XXX)"
chmod go+rx "$IMAGE_DIR"
cp -v /usr/share/minimal* "$IMAGE_DIR/"

View File

@@ -22,10 +22,6 @@ export SYSTEMD_UTF8=0
seed=750b6cd5c4ae4012a15e7be3c29e6a47
if ! systemd-detect-virt --quiet --container; then
udevadm control --log-level debug
fi
esp_guid=C12A7328-F81F-11D2-BA4B-00A0C93EC93B
xbootldr_guid=BC13C2FF-59E6-4262-A352-B275FD6F7172

View File

@@ -1348,7 +1348,6 @@ testcase_mdadm_lvm() {
}
udevadm settle
udevadm control --log-level debug
lsblk -a
echo "Check if all symlinks under /dev/disk/ are valid (pre-test)"
@@ -1368,8 +1367,6 @@ udevadm settle --timeout=60
echo "Check if all symlinks under /dev/disk/ are valid (post-test)"
helper_check_device_symlinks
udevadm control --log-level info
systemctl status systemd-udevd
touch /testok