Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Ryan Moeller 2021-04-09 00:10:28 -04:00 committed by Tony Hutter
parent 57490d5e13
commit 12e25a6ec3
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/test-runner/bin/zts-report.py.in
View File

@ -262,7 +262,6 @@ if sys.platform.startswith('freebsd'):
'inheritance/inherit_001_pos': ['FAIL', '11829'], 'inheritance/inherit_001_pos': ['FAIL', '11829'],
'pool_checkpoint/checkpoint_zhack_feat': ['FAIL', '11854'], 'pool_checkpoint/checkpoint_zhack_feat': ['FAIL', '11854'],
'removal/removal_condense_export': ['FAIL', known_reason], 'removal/removal_condense_export': ['FAIL', known_reason],
'removal/removal_with_export': ['FAIL', known_reason],
'resilver/resilver_restart_001': ['FAIL', known_reason], 'resilver/resilver_restart_001': ['FAIL', known_reason],
'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', known_reason], 'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', known_reason],
}) })

2
tests/zfs-tests/tests/functional/removal/removal_with_export.ksh
View File

@ -26,7 +26,7 @@ log_onexit default_cleanup_noexit
function callback function callback
{ {
is_linux && test_removal_with_operation_kill test_removal_with_operation_kill
log_must zpool export $TESTPOOL log_must zpool export $TESTPOOL
# #