summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2023-04-24 15:26:40 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2023-04-25 00:12:31 +0200
commite42b56c31b71751bcd9d9cc9bae765433fa68027 (patch)
treeec3acdc9af7f4364a001a8ca84d2d8b52804847e
parentb8aea8ae7d000f972d2643a3f097b46c4dbb1fe7 (diff)
downloadlvm2-e42b56c31b71751bcd9d9cc9bae765433fa68027.tar.gz
tests: try to retry remove of scsi_debug
Not quite sure if this helps anything, some of testing machines can't reliably remove scsi_debug, reporting they are in use - but it's not easily reproducible...
-rw-r--r--test/lib/aux.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index d33a13882..6a0b9da93 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -457,7 +457,12 @@ teardown_devs() {
# prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop()
if test -f SCSI_DEBUG_DEV; then
udev_wait
- test "${LVM_TEST_PARALLEL:-0}" -eq 1 || modprobe -r scsi_debug
+ test "${LVM_TEST_PARALLEL:-0}" -eq 1 || {
+ if ! modprobe -r scsi_debug ; then
+ sleep 1
+ modprobe -r scsi_debug || true
+ fi
+ }
else
test ! -f LOOP || losetup -d "$(< LOOP)" || true
test ! -f LOOPFILE || rm -f "$(< LOOPFILE)"