Merge pull request #32914 from yuwata/test-64-storage

test: several follow-ups for TEST-64-STORAGE

test/test-functions

@@ -203,6 +203,7 @@ BASICTOOLS=(
     mkfifo
     mknod
     mktemp
+    modinfo
     modprobe
     mount
     mountpoint

test/units/TEST-64-UDEV-STORAGE.sh

@@ -772,6 +772,8 @@ EOF
     btrfs filesystem show
     helper_check_device_symlinks
     helper_check_device_units
+    wipefs -a -f "${devices[@]}"
+    udevadm wait --settle --timeout=30 --removed "/dev/disk/by-uuid/$uuid" "/dev/disk/by-label/$label"
 
     echo "Multiple devices: using LUKS encrypted disks, data: raid1, metadata: raid1, mixed mode"
     uuid="deadbeef-dead-dead-beef-000000000003"