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

Similar to 5c60d3011feac20dcc3c66fe2bcafa0a889e33d1, but for udevd.

diff --git a/test/units/TEST-17-UDEV.database.sh b/test/units/TEST-17-UDEV.database.sh
index 9e507105d418fe3df7d5374960edf833f0cfad36..56a79a665b0e727787d0cf67b15e412b6e44b83f 100755 (executable)
--- a/test/units/TEST-17-UDEV.database.sh
+++ b/test/units/TEST-17-UDEV.database.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.diskseq.sh b/test/units/TEST-17-UDEV.diskseq.sh
index 5f246bd328e4d2f89bfac7ef8e948b1a2c5d3716..d1f565f8d5d1fecee119745521df9cfa00670c04 100755 (executable)
--- a/test/units/TEST-17-UDEV.diskseq.sh
+++ b/test/units/TEST-17-UDEV.diskseq.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.link-property.sh b/test/units/TEST-17-UDEV.link-property.sh
index faf05b83ebbf4de19548c783951079d9f9cb53c7..591d8c4f464038857f47220ee7eeb37fc93f1f89 100755 (executable)
--- a/test/units/TEST-17-UDEV.link-property.sh
+++ b/test/units/TEST-17-UDEV.link-property.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.loop-own.sh b/test/units/TEST-17-UDEV.loop-own.sh
index b2f6f885d0d2c102c4634c9800289eec024dffee..7961d6d0b274261f8df42ef5c65d08ce4e20c551 100755 (executable)
--- a/test/units/TEST-17-UDEV.loop-own.sh
+++ b/test/units/TEST-17-UDEV.loop-own.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.netif-INTERFACE-property.sh b/test/units/TEST-17-UDEV.netif-INTERFACE-property.sh
index deb115626d99b7d658122c8402651567ddef03b8..cc9a2cfc83f76e0b204a87640380e74550551510 100755 (executable)
--- a/test/units/TEST-17-UDEV.netif-INTERFACE-property.sh
+++ b/test/units/TEST-17-UDEV.netif-INTERFACE-property.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.netif-altname.sh b/test/units/TEST-17-UDEV.netif-altname.sh
index ccc91bfe460f151bbef684599767c9f92f4169d5..bb33df1376390b1dfa81b917d79e5327db6222fb 100755 (executable)
--- a/test/units/TEST-17-UDEV.netif-altname.sh
+++ b/test/units/TEST-17-UDEV.netif-altname.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.queued-events-serialization.sh b/test/units/TEST-17-UDEV.queued-events-serialization.sh
index cb742082f54c8cf96c9ee3bf785388e6bafe599f..6720b835a3455a091a71a563b6db1e8dfb225c98 100755 (executable)
--- a/test/units/TEST-17-UDEV.queued-events-serialization.sh
+++ b/test/units/TEST-17-UDEV.queued-events-serialization.sh
@@ -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

diff --git a/test/units/TEST-17-UDEV.watch.sh b/test/units/TEST-17-UDEV.watch.sh
index c681d748407926036c94d9d2c3341b7340ac5c87..189a2d5561badd0ce4807aafe761ce8781447aca 100755 (executable)
--- a/test/units/TEST-17-UDEV.watch.sh
+++ b/test/units/TEST-17-UDEV.watch.sh
@@ -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

diff --git a/test/units/TEST-29-PORTABLE.sh b/test/units/TEST-29-PORTABLE.sh
index 82b12d538083d61be73bd4ceac2f95adfa3fb887..4de56dd234ed928fceb31cceac4573aedf578aa5 100755 (executable)
--- a/test/units/TEST-29-PORTABLE.sh
+++ b/test/units/TEST-29-PORTABLE.sh
@@ -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

diff --git a/test/units/TEST-50-DISSECT.sh b/test/units/TEST-50-DISSECT.sh
index 40b502529782d398d0a0d6a5d8291620eaecba8d..57fd8bea039f4c8ceb6b5915078f84a34336afca 100755 (executable)
--- a/test/units/TEST-50-DISSECT.sh
+++ b/test/units/TEST-50-DISSECT.sh
@@ -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/"

diff --git a/test/units/TEST-58-REPART.sh b/test/units/TEST-58-REPART.sh
index 8484cbd1c1fdb08c5cecba82ad1f04a02742cf69..bc0ee9f0c658c066ee78dfc61cf3cca23270d5eb 100755 (executable)
--- a/test/units/TEST-58-REPART.sh
+++ b/test/units/TEST-58-REPART.sh
@@ -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
 

diff --git a/test/units/TEST-64-UDEV-STORAGE.sh b/test/units/TEST-64-UDEV-STORAGE.sh
index 5956e14aec2d722c210f174585b9723115db40f4..f54da9276852fa128c9d3d579e4403cc5baf02d4 100755 (executable)
--- a/test/units/TEST-64-UDEV-STORAGE.sh
+++ b/test/units/TEST-64-UDEV-STORAGE.sh
@@ -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