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

diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in
index 070d22db90bae677f9e02eaeb016b955cc30cb33..b5aac60ea9345bebbabc877c3caccba4f97337b1 100755 (executable)
--- 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 0ec358aadba939c6ade5fb4b6345664ab3d9c7f7..f76f76d34f5b1a744ce8d043a771089939825bc2 100755 (executable)
--- 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
 
        #