0026-tests-Add-udevadm-settle-to-wait_for_-loop-1260664.patch

   1 From 889e484922d3d5df300718ca229e12e5601e774a Mon Sep 17 00:00:00 2001
   2 From: "Brian C. Lane" <bcl@redhat.com>
   3 Date: Tue, 1 Mar 2016 10:38:26 -0800
   4 Subject: [PATCH 26/28] tests: Add udevadm settle to wait_for_ loop (#1260664)
   5
   6 Sometimes the device will vanish after the wait_for_dev_to_appear exits.
   7 Add udevadm settle in an attempt to make sure the udev system is done
   8 flapping around and the device will stay in place.
   9
  10 Related: rhbz#1260664
  11 ---
  12  tests/t-lib-helpers.sh            | 2 ++
  13  tests/t-local.sh                  | 2 ++
  14  tests/t6001-psep.sh               | 2 ++
  15  tests/t6004-dm-many-partitions.sh | 1 +
  16  tests/t6005-dm-uuid.sh            | 2 ++
  17  tests/t6100-mdraid-partitions.sh  | 1 +
  18  6 files changed, 10 insertions(+)
  19
  20 diff --git a/tests/t-lib-helpers.sh b/tests/t-lib-helpers.sh
  21 index 4e83a05..298f1fc 100644
  22 --- a/tests/t-lib-helpers.sh
  23 +++ b/tests/t-lib-helpers.sh
  24 @@ -371,6 +371,7 @@ wait_for_dev_to_appear_()
  25    local i=0
  26    local incr=1
  27    while :; do
  28 +    udevadm settle
  29      ls "$file" > /dev/null 2>&1 && return 0
  30      sleep .1 2>/dev/null || { sleep 1; incr=10; }
  31      i=$(expr $i + $incr); test $i = 20 && break
  32 @@ -386,6 +387,7 @@ wait_for_dev_to_disappear_()
  33    local i=0
  34    local incr=1
  35    while :; do
  36 +    udevadm settle
  37      ls "$file" > /dev/null 2>&1 || return 0
  38      sleep .1 2>/dev/null || { sleep 1; incr=10; }
  39      i=$(expr $i + $incr); test $i -ge $(expr $n_sec \* 10) && break
  40 diff --git a/tests/t-local.sh b/tests/t-local.sh
  41 index b40a5a0..a7d5226 100644
  42 --- a/tests/t-local.sh
  43 +++ b/tests/t-local.sh
  44 @@ -47,6 +47,7 @@ wait_for_dev_to_appear_()
  45    local i=0
  46    local incr=1
  47    while :; do
  48 +    udevadm settle
  49      ls "$file" > /dev/null 2>&1 && return 0
  50      sleep .1 2>/dev/null || { sleep 1; incr=10; }
  51      i=$(expr $i + $incr); test $i = 20 && break
  52 @@ -110,6 +111,7 @@ scsi_debug_setup_()
  53    local i=0
  54    local new_dev
  55    while :; do
  56 +    udevadm settle
  57      new_dev=$(new_sdX_) && break
  58      sleep .1 2>/dev/null || { sleep 1; incr=10; }
  59      i=$(expr $i + $incr); test $i = 20 && break
  60 diff --git a/tests/t6001-psep.sh b/tests/t6001-psep.sh
  61 index 4c758e8..2985cf5 100644
  62 --- a/tests/t6001-psep.sh
  63 +++ b/tests/t6001-psep.sh
  64 @@ -19,6 +19,8 @@
  65  . "${srcdir=.}/init.sh"; path_prepend_ ../parted
  66
  67  require_root_
  68 +require_udevadm_settle_
  69 +
  70  (dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
  71
  72  # Device maps names - should be random to not conflict with existing ones on
  73 diff --git a/tests/t6004-dm-many-partitions.sh b/tests/t6004-dm-many-partitions.sh
  74 index 7ebc48a..01d7fc0 100755
  75 --- a/tests/t6004-dm-many-partitions.sh
  76 +++ b/tests/t6004-dm-many-partitions.sh
  77 @@ -20,6 +20,7 @@
  78  . "${srcdir=.}/init.sh"; path_prepend_ ../parted
  79
  80  require_root_
  81 +require_udevadm_settle_
  82  (dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
  83
  84  ss=$sector_size_
  85 diff --git a/tests/t6005-dm-uuid.sh b/tests/t6005-dm-uuid.sh
  86 index ce1251a..a48ae72 100755
  87 --- a/tests/t6005-dm-uuid.sh
  88 +++ b/tests/t6005-dm-uuid.sh
  89 @@ -20,6 +20,7 @@
  90  . "${srcdir=.}/init.sh"; path_prepend_ ../parted
  91
  92  require_root_
  93 +require_udevadm_settle_
  94  (dmsetup --help) > /dev/null 2>&1 || skip_test_ "No dmsetup installed"
  95
  96  ss=$sector_size_
  97 @@ -46,6 +47,7 @@ for ((i=1; i<=$n_partitions; i+=1)); do
  98    cmd="$cmd mkpart p$i ${s}s ${s}s"
  99  done
 100  parted -m -a min -s /dev/mapper/$dm_name mklabel gpt $cmd > /dev/null 2>&1 || fail=1
 101 +wait_for_dev_to_appear_ /dev/mapper/${dm_name}p${n_partitions} || fail=1
 102
 103  # Make sure all the partitions have UUIDs
 104  for ((i=1; i<=$n_partitions; i+=1)); do
 105 diff --git a/tests/t6100-mdraid-partitions.sh b/tests/t6100-mdraid-partitions.sh
 106 index dbc5986..dbb1686 100755
 107 --- a/tests/t6100-mdraid-partitions.sh
 108 +++ b/tests/t6100-mdraid-partitions.sh
 109 @@ -38,6 +38,7 @@ parted -s "$scsi_dev" mklabel gpt \
 110      mkpart p1 ext2 1M 4M \
 111      mkpart p2 ext2 5M 8M > out 2>&1 || fail=1
 112  compare /dev/null out || fail=1
 113 +wait_for_dev_to_appear_ ${scsi_dev}2 || { fail=1; cat /proc/partitions; }
 114
 115  cleanup_fn_() {
 116    # stop mdraid array
 117 --
 118 2.5.0
 119