diff options
| author | Ryan Moeller <[email protected]> | 2021-10-01 11:36:02 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-01 09:36:02 -0600 |
| commit | 96ad227a9dad38dd928bda6016240f590e7968b1 (patch) | |
| tree | 882e897803614b733573d60da0e2d20e35e84b23 /tests/zfs-tests/include | |
| parent | ce2bdcedf549b2d83ae9df23a3fa0188b33327b7 (diff) | |
ZTS: Minimize udev_wait in zvol_misc tests
The zvol_misc tests, in particular zvol_misc_volmode, make use of a
common udev_wait function to wait for zvol devices in /dev to quiesce
on Linux. On other platforms this function currently only sleeps for
one second before returning. This is insufficient, and
zvol_misc_volmode has been flaky on FreeBSD as a result.
Replace udev_wait with block_device_wait, passing through the optional
device parameter where possible. Rearrange a few checks to strengthen
the verifications we are making and avoid unnecessarily sleeping. We
must keep udev_wait in a couple places to pass in Github CI workflows.
Remove zvol_misc_volmode from the maybe failing tests on FreeBSD in
zts-report.py.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #12583
Diffstat (limited to 'tests/zfs-tests/include')
| -rw-r--r-- | tests/zfs-tests/include/blkdev.shlib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/include/blkdev.shlib b/tests/zfs-tests/include/blkdev.shlib index bcba8ee75..bf7095290 100644 --- a/tests/zfs-tests/include/blkdev.shlib +++ b/tests/zfs-tests/include/blkdev.shlib @@ -73,7 +73,7 @@ function scan_scsi_hosts function block_device_wait { if is_linux; then - udevadm trigger $* + udevadm trigger $* 2>/dev/null typeset start=$SECONDS udevadm settle typeset elapsed=$((SECONDS - start)) |