From d3fe62cb35474fc6ec12014f3ace7cb7655cf162 Mon Sep 17 00:00:00 2001 From: Ryan Moeller Date: Fri, 13 Mar 2020 12:29:10 -0400 Subject: [PATCH] ZTS: Update flaky tests in zts-report Some tests which pass on FreeBSD but fail on Linux had been put in the "maybe" set. Move these back to "known" under an "if Linux" check so the expected outcome is clear. Add some tests that have been found to be flaky on FreeBSD stable/12 to the "maybe" set. Reviewed-by: John Kennedy Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Ryan Moeller Closes #10120 --- tests/test-runner/bin/zts-report.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py index 9f96d03ec..92fc5f6d6 100755 --- a/tests/test-runner/bin/zts-report.py +++ b/tests/test-runner/bin/zts-report.py @@ -165,6 +165,17 @@ if sys.platform.startswith('freebsd'): 'cli_root/zpool_wait/zpool_wait_trim_flag': ['SKIP', trim_reason], 'link_count/link_count_001': ['SKIP', na_reason], }) +elif sys.platform.startswith('linux'): + known.update({ + 'casenorm/mixed_formd_lookup': ['FAIL', '7633'], + 'casenorm/mixed_formd_delete': ['FAIL', '7633'], + 'casenorm/sensitive_formd_lookup': ['FAIL', '7633'], + 'casenorm/sensitive_formd_delete': ['FAIL', '7633'], + 'limits/filesystem_limit': ['FAIL', '8226'], + 'limits/snapshot_limit': ['FAIL', '8226'], + 'removal/removal_with_zdb': ['SKIP', known_reason], + }) + # # These tests may occasionally fail or be skipped. We want there failures @@ -181,10 +192,6 @@ maybe = { 'alloc_class/alloc_class_012_pos': ['FAIL', '9142'], 'alloc_class/alloc_class_013_pos': ['FAIL', '9142'], 'cache/cache_010_neg': ['FAIL', known_reason], - 'casenorm/mixed_formd_lookup': ['FAIL', '7633'], - 'casenorm/mixed_formd_delete': ['FAIL', '7633'], - 'casenorm/sensitive_formd_lookup': ['FAIL', '7633'], - 'casenorm/sensitive_formd_delete': ['FAIL', '7633'], 'chattr/setup': ['SKIP', exec_reason], 'cli_root/zdb/zdb_006_pos': ['FAIL', known_reason], 'cli_root/zfs_get/zfs_get_004_pos': ['FAIL', known_reason], @@ -210,13 +217,10 @@ maybe = { 'history/history_010_pos': ['SKIP', exec_reason], 'io/mmap': ['SKIP', fio_reason], 'largest_pool/largest_pool_001_pos': ['FAIL', known_reason], - 'limits/filesystem_limit': ['FAIL', '8226'], - 'limits/snapshot_limit': ['FAIL', '8226'], 'pyzfs/pyzfs_unittest': ['SKIP', python_deps_reason], 'no_space/enospc_002_pos': ['FAIL', enospc_reason], 'projectquota/setup': ['SKIP', exec_reason], 'redundancy/redundancy_004_neg': ['FAIL', '7290'], - 'removal/removal_with_zdb': ['SKIP', known_reason], 'reservation/reservation_008_pos': ['FAIL', '7741'], 'reservation/reservation_018_pos': ['FAIL', '5642'], 'rsend/rsend_019_pos': ['FAIL', '6086'], @@ -238,6 +242,15 @@ maybe = { 'zvol/zvol_ENOSPC/zvol_ENOSPC_001_pos': ['FAIL', '5848'], } +if sys.platform.startswith('freebsd'): + maybe.update({ + 'cli_root/zfs_copies/zfs_copies_002_pos': ['FAIL', known_reason], + 'cli_root/zpool_import/zpool_import_missing_003_pos': + ['FAIL', known_reason], + 'delegate/zfs_allow_003_pos': ['FAIL', known_reason], + 'resilver/resilver_restart_001': ['FAIL', known_reason], + }) + def usage(s): print(s)