eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-05 16:00:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use unconditionally sleep 1 in scsi_debug test

Browse Source
This commit is contained in:
Milan Broz
2023-06-04 11:54:42 +02:00
parent d6107bf241
commit 5042ec2cd0
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/debian.yml
View File

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

2
tests/align-test
View File

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

2
tests/align-test2
View File

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

2
tests/blockwise-compat-test
View File

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

4
tests/discards-test
View File

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

2
tests/keyring-compat-test
View File

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

4
tests/reencryption-compat-test
View File

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

2
tests/unit-wipe-test
View File

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