Use unconditionally sleep 1 in scsi_debug test

.gitlab/ci/debian.yml

@@ -75,7 +75,7 @@ test-mergerq-job-debian-meson:
     - sudo apt-get -y install -y -qq meson ninja-build
     - meson setup build
     - ninja -C build
-    - cd build && sudo -E meson test --verbose
+    - cd build && sudo -E meson test --verbose --print-errorlogs
 
 test-main-commit-job-debian-meson:
   extends:
@@ -95,4 +95,4 @@ test-main-commit-job-debian-meson:
     - sudo apt-get -y install -y -qq meson ninja-build
     - meson setup build
     - ninja -C build
-    - cd build && sudo -E meson test --verbose
+    - cd build && sudo -E meson test --verbose --print-errorlogs

tests/align-test

@@ -92,7 +92,7 @@ add_device() {
 		exit 77
 	fi
 
-	sleep 2
+	sleep 1
 	DEV=$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 
 	if [ ! -e /sys/block/$DEV/alignment_offset ] ; then

tests/align-test2

@@ -87,7 +87,7 @@ add_device() {
 		exit 77
 	fi
 
-	sleep 2
+	sleep 1
 	DEV=$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 
 	if [ ! -e /sys/block/$DEV/alignment_offset ] ; then

tests/blockwise-compat-test

@@ -68,7 +68,7 @@ add_device() {
 	if [ $? -ne 0 ] ; then
 		skip "This kernel seems to not support proper scsi_debug module."
 	fi
-	grep -q scsi_debug /sys/block/*/device/model || sleep 2
+	sleep 1
 	DEV=$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 	DEV="/dev/$DEV"
 	[ -b $DEV ] || fail "Cannot find $DEV."

tests/discards-test

@@ -13,7 +13,7 @@ cleanup() {
 	[ -b /dev/mapper/$DEV_NAME ] && dmsetup remove --retry $DEV_NAME
 	udevadm settle >/dev/null 2>&1
 	rmmod scsi_debug >/dev/null 2>&1
-	sleep 2
+	sleep 1
 }
 
 fail()
@@ -54,7 +54,7 @@ add_device() {
 		exit 77
 	fi
 
-	sleep 2
+	sleep 1
 	DEV=$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 
 	DEV="/dev/$DEV"

tests/keyring-compat-test

@@ -123,7 +123,7 @@ add_device() {
 		exit 77
 	fi
 
-	sleep 2
+	sleep 1
 	DEV=$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 
 	DEV="/dev/$DEV"

tests/reencryption-compat-test

@@ -33,7 +33,7 @@ function fips_mode()
 function del_scsi_device()
 {
 	rmmod scsi_debug >/dev/null 2>&1
-	sleep 2
+	sleep 1
 }
 
 function remove_mapping()
@@ -88,7 +88,7 @@ function add_scsi_device() {
 		exit 77
 	fi
 
-	sleep 2
+	sleep 1
 	SCSI_DEV="/dev/"$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 	[ -b $SCSI_DEV ] || fail "Cannot find $SCSI_DEV."
 }

tests/unit-wipe-test

@@ -41,7 +41,7 @@ function add_device()
 	if [ $? -ne 0 ] ; then
 		skip "This kernel seems to not support proper scsi_debug module."
 	fi
-	grep -q scsi_debug /sys/block/*/device/model || sleep 2
+	sleep 1
 	DEV=$(grep -l -e scsi_debug /sys/block/*/device/model | cut -f4 -d /)
 	DEV="/dev/$DEV"
 	[ -b $DEV ] || fail "Cannot find $DEV."