From ad342153647f4699baaeb606935d1d254df8a46b Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Fri, 9 Apr 2021 00:10:28 -0400 Subject: [PATCH] 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 Reviewed-by: Igor Kozhukhov Signed-off-by: Ryan Moeller Closes #11856 --- tests/test-runner/bin/zts-report.py.in | 1 - .../zfs-tests/tests/functional/removal/removal_with_export.ksh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index 070d22db90..b5aac60ea9 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -263,7 +263,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 0ec358aadb..f76f76d34f 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 #