summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan Moeller <ryan@iXsystems.com>2021-04-09 00:10:28 -0400
committerBrian Behlendorf <behlendorf1@llnl.gov>2021-05-19 20:00:08 -0700
commit3486032ccd8d12a6a0f4a6e54023ea1ec4acfac6 (patch)
treea13b35d562cbbcb47c374db35c7ec927ac75aa70
parentdea9aedfcf5d6723cdf5c425f0f13c33607161d7 (diff)
ZTS: Improve cleanup in removal_with_export
Kill the removal operation on every platform, not just Linux. The test has been fixed and is now stable on FreeBSD. Reviewed-by: John Kennedy <john.kennedy@delphix.com> Reviewed-by: Igor Kozhukhov <igor@dilos.org> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #11856
-rwxr-xr-xtests/test-runner/bin/zts-report.py.in1
-rwxr-xr-xtests/zfs-tests/tests/functional/removal/removal_with_export.ksh2
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in
index 06fd7dffe..6b779fef8 100755
--- a/tests/test-runner/bin/zts-report.py.in
+++ b/tests/test-runner/bin/zts-report.py.in
@@ -262,7 +262,6 @@ if sys.platform.startswith('freebsd'):
'inheritance/inherit_001_pos': ['FAIL', '11829'],
'pool_checkpoint/checkpoint_zhack_feat': ['FAIL', '11854'],
'removal/removal_condense_export': ['FAIL', known_reason],
- 'removal/removal_with_export': ['FAIL', known_reason],
'resilver/resilver_restart_001': ['FAIL', known_reason],
'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', known_reason],
})
diff --git a/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh b/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh
index 0ec358aad..f76f76d34 100755
--- a/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh
+++ b/tests/zfs-tests/tests/functional/removal/removal_with_export.ksh
@@ -26,7 +26,7 @@ log_onexit default_cleanup_noexit
function callback
{
- is_linux && test_removal_with_operation_kill
+ test_removal_with_operation_kill
log_must zpool export $TESTPOOL
#