diff options
| author | Ryan Moeller <[email protected]> | 2021-10-01 11:36:02 -0400 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2022-02-16 17:58:55 -0800 |
| commit | fc3230a78116490f7a18e4110b374b0ccad5a198 (patch) | |
| tree | 89852dba995ef04f5f0bdd513f2699dfd240d363 /tests/test-runner/bin | |
| parent | ed064ed59640892c462d1126e2883a068d71243d (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/test-runner/bin')
| -rwxr-xr-x | tests/test-runner/bin/zts-report.py.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index 60c19fabc..c4f01b871 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -278,7 +278,6 @@ if sys.platform.startswith('freebsd'): 'delegate/zfs_allow_003_pos': ['FAIL', known_reason], 'inheritance/inherit_001_pos': ['FAIL', '11829'], 'resilver/resilver_restart_001': ['FAIL', known_reason], - 'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', known_reason], }) elif sys.platform.startswith('linux'): maybe.update({ |