From bc6bd62c0ebe0057e6f3dee2cd3e8f8e984ee060 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 7 Apr 2022 01:35:26 +0900 Subject: [PATCH] test: use udevadm lock when partitioning block devices We can use `sfdisk --lock` for these cases, but some CI environments have old sfdisk which does not support `--lock` option. --- test/units/testsuite-64.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh index 44f362ec6f..5f50131dd5 100755 --- a/test/units/testsuite-64.sh +++ b/test/units/testsuite-64.sh @@ -168,7 +168,7 @@ $(printf 'name="test%d", size=2M\n' {1..50}) EOF # Initial partition table - sfdisk -q -X gpt "$blockdev" <"$partscript" + udevadm lock --device="$blockdev" sfdisk -q -X gpt "$blockdev" <"$partscript" # Delete the partitions, immediately recreate them, wait for udev to settle # down, and then check if we have any dangling symlinks in /dev/disk/. Rinse @@ -177,8 +177,8 @@ EOF # On unpatched udev versions the delete-recreate cycle may trigger a race # leading to dead symlinks in /dev/disk/ for i in {1..100}; do - sfdisk -q --delete "$blockdev" - sfdisk -q -X gpt "$blockdev" <"$partscript" + udevadm lock --device="$blockdev" sfdisk -q --delete "$blockdev" + udevadm lock --device="$blockdev" sfdisk -q -X gpt "$blockdev" <"$partscript" if ((i % 10 == 0)); then udevadm wait --settle --timeout=30 "$blockdev" @@ -281,7 +281,7 @@ testcase_btrfs_basic() { echo "Multiple devices: using partitions, data: single, metadata: raid1" uuid="deadbeef-dead-dead-beef-000000000001" label="btrfs_mpart" - sfdisk --wipe=always "${devices[0]}" <