aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Norris <[email protected]>2024-07-18 19:53:35 +1000
committerBrian Behlendorf <[email protected]>2024-08-06 12:08:24 -0700
commit6c7d41a64373a2df615ec804b9c5d635d5019064 (patch)
tree3ac2340c1811add74bdd663b581aa71988b95e9e
parent670147be53c9200bb842b6109125ac007bbccc23 (diff)
ZTS: remove skips for zvol_misc tests
Last commit should fix the underlying problem, so these should be passing reliably again. Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Signed-off-by: Rob Norris <[email protected]> Closes #16364
-rwxr-xr-xtests/test-runner/bin/zts-report.py.in4
-rwxr-xr-xtests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh9
-rwxr-xr-xtests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh9
3 files changed, 0 insertions, 22 deletions
diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in
index 8c0a89804..aefbbb770 100755
--- a/tests/test-runner/bin/zts-report.py.in
+++ b/tests/test-runner/bin/zts-report.py.in
@@ -351,10 +351,6 @@ elif sys.platform.startswith('linux'):
'mmp/mmp_active_import': ['FAIL', known_reason],
'mmp/mmp_exported_import': ['FAIL', known_reason],
'mmp/mmp_inactive_import': ['FAIL', known_reason],
- 'zvol/zvol_misc/zvol_misc_fua': ['SKIP', 14872],
- 'zvol/zvol_misc/zvol_misc_snapdev': ['FAIL', 12621],
- 'zvol/zvol_misc/zvol_misc_trim': ['SKIP', 14872],
- 'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', known_reason],
})
# Not all Github actions runners have scsi_debug module, so we may skip
diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh
index 619d8d0e8..9ebd5b149 100755
--- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_fua.ksh
@@ -45,15 +45,6 @@ fi
if ! is_linux ; then
log_unsupported "Only linux supports dd with oflag=dsync for FUA writes"
-else
- if [[ $(linux_version) -gt $(linux_version "6.2") ]]; then
- log_unsupported "Disabled while issue #14872 is being worked"
- fi
-
- # Disabled for the CentOS 9 kernel
- if [[ $(linux_version) -eq $(linux_version "5.14") ]]; then
- log_unsupported "Disabled while issue #14872 is being worked"
- fi
fi
typeset datafile1="$(mktemp zvol_misc_fua1.XXXXXX)"
diff --git a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh
index c0b191aaf..47cc42b9b 100755
--- a/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh
+++ b/tests/zfs-tests/tests/functional/zvol/zvol_misc/zvol_misc_trim.ksh
@@ -44,15 +44,6 @@
verify_runnable "global"
if is_linux ; then
- if [[ $(linux_version) -gt $(linux_version "6.2") ]]; then
- log_unsupported "Disabled while issue #14872 is being worked"
- fi
-
- # Disabled for the CentOS 9 kernel
- if [[ $(linux_version) -eq $(linux_version "5.14") ]]; then
- log_unsupported "Disabled while issue #14872 is being worked"
- fi
-
# We need '--force' here since the prior tests may leave a filesystem
# on the zvol, and blkdiscard will see that filesystem and print a
# warning unless you force it.