|
 |
aeed84 |
From 0d00bd73ba85c18082cbe47dd76e2adeba7e8620 Mon Sep 17 00:00:00 2001
|
|
|
aeed84 |
From: "Brian C. Lane" <bcl@redhat.com>
|
|
|
aeed84 |
Date: Tue, 1 Mar 2016 10:38:26 -0800
|
|
|
aeed84 |
Subject: [PATCH] tests: Add udevadm settle to wait_for_ loop (#1260664)
|
|
|
aeed84 |
|
|
|
aeed84 |
Sometimes the device will vanish after the wait_for_dev_to_appear exits.
|
|
|
aeed84 |
Add udevadm settle in an attempt to make sure the udev system is done
|
|
|
aeed84 |
flapping around and the device will stay in place.
|
|
|
aeed84 |
|
|
|
aeed84 |
Related: rhbz#1260664
|
|
|
aeed84 |
---
|
|
|
aeed84 |
tests/t-lib-helpers.sh | 2 ++
|
|
|
aeed84 |
tests/t-local.sh | 2 ++
|
|
|
aeed84 |
tests/t6001-psep.sh | 2 ++
|
|
|
aeed84 |
tests/t6002-dm-many-partitions.sh | 1 +
|
|
|
aeed84 |
tests/t6003-dm-uuid.sh | 2 ++
|
|
|
aeed84 |
tests/t6100-mdraid-partitions.sh | 1 +
|
|
|
aeed84 |
6 files changed, 10 insertions(+)
|
|
|
aeed84 |
|
|
|
aeed84 |
diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh
|
|
|
aeed84 |
index 4b3c122..b65d675 100644
|
|
|
aeed84 |
--- a/tests/t-lib-helpers.sh
|
|
|
aeed84 |
+++ b/tests/t-lib-helpers.sh
|
|
|
aeed84 |
@@ -371,6 +371,7 @@ wait_for_dev_to_appear_()
|
|
|
aeed84 |
local i=0
|
|
|
aeed84 |
local incr=1
|
|
|
aeed84 |
while :; do
|
|
|
aeed84 |
+ udevadm settle
|
|
|
aeed84 |
ls "$file" > /dev/null 2>&1 && return 0
|
|
|
aeed84 |
sleep .1 2>/dev/null || { sleep 1; incr=10; }
|
|
|
aeed84 |
i=$(expr $i + $incr); test $i = 20 && break
|
|
|
aeed84 |
@@ -386,6 +387,7 @@ wait_for_dev_to_disappear_()
|
|
|
aeed84 |
local i=0
|
|
|
aeed84 |
local incr=1
|
|
|
aeed84 |
while :; do
|
|
|
aeed84 |
+ udevadm settle
|
|
|
aeed84 |
ls "$file" > /dev/null 2>&1 || return 0
|
|
|
aeed84 |
sleep .1 2>/dev/null || { sleep 1; incr=10; }
|
|
|
aeed84 |
i=$(expr $i + $incr); test $i -ge $(expr $n_sec \* 10) && break
|
|
|
aeed84 |
diff --git a/tests/t-local.sh b/tests/t-local.sh
|
|
|
aeed84 |
index dde1b8d..5305865 100644
|
|
|
aeed84 |
--- a/tests/t-local.sh
|
|
|
aeed84 |
+++ b/tests/t-local.sh
|
|
|
aeed84 |
@@ -47,6 +47,7 @@ wait_for_dev_to_appear_()
|
|
|
aeed84 |
local i=0
|
|
|
aeed84 |
local incr=1
|
|
|
aeed84 |
while :; do
|
|
|
aeed84 |
+ udevadm settle
|
|
|
aeed84 |
ls "$file" > /dev/null 2>&1 && return 0
|
|
|
aeed84 |
sleep .1 2>/dev/null || { sleep 1; incr=10; }
|
|
|
aeed84 |
i=$(expr $i + $incr); test $i = 20 && break
|
|
|
aeed84 |
@@ -110,6 +111,7 @@ scsi_debug_setup_()
|
|
|
aeed84 |
local i=0
|
|
|
aeed84 |
local new_dev
|
|
|
aeed84 |
while :; do
|
|
|
aeed84 |
+ udevadm settle
|
|
|
aeed84 |
new_dev=$(new_sdX_) && break
|
|
|
aeed84 |
sleep .1 2>/dev/null || { sleep 1; incr=10; }
|
|
|
aeed84 |
i=$(expr $i + $incr); test $i = 20 && break
|
|
|
aeed84 |
diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh
|
|
|
aeed84 |
index b747732..f22c877 100644
|
|
|
aeed84 |
--- a/tests/t6001-psep.sh
|
|
|
aeed84 |
+++ b/tests/t6001-psep.sh
|
|
|
aeed84 |
@@ -20,6 +20,8 @@
|
|
|
aeed84 |
. "${srcdir=.}/init.sh"; path_prepend_ ../parted
|
|
|
aeed84 |
|
|
|
aeed84 |
require_root_
|
|
|
aeed84 |
+require_udevadm_settle_
|
|
|
aeed84 |
+
|
|
|
aeed84 |
(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
|
|
aeed84 |
|
|
|
aeed84 |
# Device maps names - should be random to not conflict with existing ones on
|
|
|
aeed84 |
diff --git a/tests/t6002-dm-many-partitions.sh b/tests/t6002-dm-many-partitions.sh
|
|
|
aeed84 |
index 247c9ee..13894f5 100755
|
|
|
aeed84 |
--- a/tests/t6002-dm-many-partitions.sh
|
|
|
aeed84 |
+++ b/tests/t6002-dm-many-partitions.sh
|
|
|
aeed84 |
@@ -20,6 +20,7 @@
|
|
|
aeed84 |
. "${srcdir=.}/init.sh"; path_prepend_ ../parted
|
|
|
aeed84 |
|
|
|
aeed84 |
require_root_
|
|
|
aeed84 |
+require_udevadm_settle_
|
|
|
aeed84 |
(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
|
|
aeed84 |
|
|
|
aeed84 |
ss=$sector_size_
|
|
|
aeed84 |
diff --git a/tests/t6003-dm-uuid.sh b/tests/t6003-dm-uuid.sh
|
|
|
aeed84 |
index f58cb06..f51e45f 100755
|
|
|
aeed84 |
--- a/tests/t6003-dm-uuid.sh
|
|
|
aeed84 |
+++ b/tests/t6003-dm-uuid.sh
|
|
|
aeed84 |
@@ -20,6 +20,7 @@
|
|
|
aeed84 |
. "${srcdir=.}/init.sh"; path_prepend_ ../parted
|
|
|
aeed84 |
|
|
|
aeed84 |
require_root_
|
|
|
aeed84 |
+require_udevadm_settle_
|
|
|
aeed84 |
(dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
|
|
|
aeed84 |
|
|
|
aeed84 |
ss=$sector_size_
|
|
|
aeed84 |
@@ -46,6 +47,7 @@ for ((i=1; i<=$n_partitions; i+=1)); do
|
|
|
aeed84 |
cmd="$cmd mkpart p$i ${s}s ${s}s"
|
|
|
aeed84 |
done
|
|
|
aeed84 |
parted -m -a min -s /dev/mapper/$dm_name mklabel gpt $cmd > /dev/null 2>&1 || fail=1
|
|
|
aeed84 |
+wait_for_dev_to_appear_ /dev/mapper/${dm_name}p${n_partitions} || fail=1
|
|
|
aeed84 |
|
|
|
aeed84 |
# Make sure all the partitions have UUIDs
|
|
|
aeed84 |
for ((i=1; i<=$n_partitions; i+=1)); do
|
|
|
aeed84 |
diff --git a/tests/t6100-mdraid-partitions.sh b/tests/t6100-mdraid-partitions.sh
|
|
|
aeed84 |
index d7e7d6a..a74afe0 100755
|
|
|
aeed84 |
--- a/tests/t6100-mdraid-partitions.sh
|
|
|
aeed84 |
+++ b/tests/t6100-mdraid-partitions.sh
|
|
|
aeed84 |
@@ -38,6 +38,7 @@ parted -s "$scsi_dev" mklabel gpt \
|
|
|
aeed84 |
mkpart p1 ext2 1M 4M \
|
|
|
aeed84 |
mkpart p2 ext2 5M 8M > out 2>&1 || fail=1
|
|
|
aeed84 |
compare /dev/null out || fail=1
|
|
|
aeed84 |
+wait_for_dev_to_appear_ ${scsi_dev}2 || { fail=1; cat /proc/partitions; }
|
|
|
aeed84 |
|
|
|
aeed84 |
cleanup_fn_() {
|
|
|
aeed84 |
# stop mdraid array
|
|
|
aeed84 |
--
|
|
|
aeed84 |
2.5.0
|
|
|
aeed84 |
|