From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 1 Feb 2023 14:03:54 +0000 (+0900)
Subject: test: make helper_check_device_units() log unit name
X-Git-Tag: v253-rc2~13^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5479d0f83a80810c475b14fbaf61872f4df6b20e;p=thirdparty%2Fsystemd.git

test: make helper_check_device_units() log unit name
---

diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index c4406f381bf..d5ccad7e64a 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -89,6 +89,8 @@ check_device_unit() {(
     path="${2?}"
     unit=$(systemd-escape --path --suffix=device "$path")
 
+    [[ "$log_level" == 1 ]] && echo "INFO: check_device_unit($unit)"
+
     syspath=$(systemctl show --value --property SysFSPath "$unit" 2>/dev/null)
     if [[ -z "$syspath" ]]; then
         [[ "$log_level" == 1 ]] && echo >&2 "ERROR: $unit not found."
@@ -156,12 +158,11 @@ helper_check_device_units() {(
 
     local i
 
-    for ((i = 0; i < 20; i++)); do
-        (( i == 0 )) || sleep .5
-
+    for (( i = 0; i < 20; i++ )); do
         if check_device_units 0 "$@"; then
             return 0
         fi
+        sleep .5
     done
 
     check_device_units 1 "$@"