diff options
author | Brian C. Lane <bcl@redhat.com> | 2017-02-24 11:06:20 -0800 |
---|---|---|
committer | Brian C. Lane <bcl@redhat.com> | 2017-05-02 09:18:52 -0700 |
commit | 40e55a0819862d5dbe2098803735f8c48fb30b6d (patch) | |
tree | ca2ea03f6de37a0335074b92af67f0c4b2f82957 /tests | |
parent | c11f5c005270d24bc3905ab3b743e96fc1a9a507 (diff) | |
download | parted-40e55a0819862d5dbe2098803735f8c48fb30b6d.tar.gz |
Increase timeout for rmmod scsi_debug and make it a framework failure
On some hardware scsi_debug can take longer to remove. If this fails it
inevitably results in the next test failing since it cannot load
scsi_debug.
Increse the timeout to 40 loops (8 seconds), and if it hits the limit
without succeeding call framework_failure_
Diffstat (limited to 'tests')
-rw-r--r-- | tests/t-local.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/t-local.sh b/tests/t-local.sh index 13073d2..2ba7ee1 100644 --- a/tests/t-local.sh +++ b/tests/t-local.sh @@ -27,13 +27,14 @@ scsi_debug_cleanup_() # "Module scsi_debug is in use". i=0 udevadm settle - while [ $i -lt 10 ] ; do + while [ $i -lt 40 ] ; do rmmod scsi_debug \ && { test "$VERBOSE" = yes && warn_ $ME_ rmmod scsi_debug...; break; } sleep .2 || sleep 1 i=$((i + 1)) done udevadm settle + test $i = 40 && framework_failure_ rmmod scsi_debug failed. fi rm -fr $scsi_debug_lock_dir_ } |