diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-01-28 02:42:51 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-01-28 02:42:51 +0100 |
| commit | 477ebd2b3024599727e79c92a6e7549e7f4353d6 (patch) | |
| tree | c6231224f494aa665470fc5a5efde6b2cea2929e /test/units/testsuite-64.sh | |
| parent | Merge pull request #22276 from mrc0mmand/TEST-64-workaround (diff) | |
| download | systemd-477ebd2b3024599727e79c92a6e7549e7f4353d6.tar.xz systemd-477ebd2b3024599727e79c92a6e7549e7f4353d6.zip | |
Revert "test: wait for newly created btrfs triggered"
This reverts commit 39f83dd7606730f65eb9831703a8ea3667682a85.
As this does not solve the issue.
Diffstat (limited to '')
| -rwxr-xr-x | test/units/testsuite-64.sh | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh index 9ee3699ea8..f75382d90a 100755 --- a/test/units/testsuite-64.sh +++ b/test/units/testsuite-64.sh @@ -390,10 +390,6 @@ testcase_btrfs_basic() { uuid="deadbeef-dead-dead-beef-000000000000" label="btrfs_root" mkfs.btrfs -L "$label" -U "$uuid" "${devices[0]}" - # We need to do some active waiting anyway, as it may take kernel a bit - # to trigger the newly created btrfs - helper_wait_for_dev "/dev/disk/by-uuid/$uuid" - helper_wait_for_dev "/dev/disk/by-label/$label" udevadm settle btrfs filesystem show test -e "/dev/disk/by-uuid/$uuid" @@ -413,8 +409,6 @@ name="diskpart4", size=85M EOF udevadm settle mkfs.btrfs -d single -m raid1 -L "$label" -U "$uuid" /dev/disk/by-partlabel/diskpart{1..4} - helper_wait_for_dev "/dev/disk/by-uuid/$uuid" - helper_wait_for_dev "/dev/disk/by-label/$label" udevadm settle btrfs filesystem show test -e "/dev/disk/by-uuid/$uuid" @@ -426,8 +420,6 @@ EOF uuid="deadbeef-dead-dead-beef-000000000002" label="btrfs_mdisk" mkfs.btrfs -M -d raid10 -m raid10 -L "$label" -U "$uuid" "${devices[@]}" - helper_wait_for_dev "/dev/disk/by-uuid/$uuid" - helper_wait_for_dev "/dev/disk/by-label/$label" udevadm settle btrfs filesystem show test -e "/dev/disk/by-uuid/$uuid" @@ -465,8 +457,6 @@ EOF ls -l /dev/mapper/encbtrfs{0..3} # Create a multi-device btrfs filesystem on the LUKS devices mkfs.btrfs -M -d raid1 -m raid1 -L "$label" -U "$uuid" /dev/mapper/encbtrfs{0..3} - helper_wait_for_dev "/dev/disk/by-uuid/$uuid" - helper_wait_for_dev "/dev/disk/by-label/$label" udevadm settle btrfs filesystem show test -e "/dev/disk/by-uuid/$uuid" @@ -493,8 +483,6 @@ EOF # Start the corresponding mount unit and check if the btrfs device was reconstructed # correctly systemctl start "${mpoint##*/}.mount" - helper_wait_for_dev "/dev/disk/by-uuid/$uuid" - helper_wait_for_dev "/dev/disk/by-label/$label" btrfs filesystem show test -e "/dev/disk/by-uuid/$uuid" test -e "/dev/disk/by-label/$label" |