From 52740970cedb742749ef686aca09562ac407ded1 Mon Sep 17 00:00:00 2001 From: Sean Doran Date: Sat, 24 Jul 2021 12:46:48 +0100 Subject: [PATCH] appveyor CI runfile changes move scrub and other maybe-stack-heavy things up front get rid of some tests that tend to run a long time --- tests/runfiles/macOS-CI.run | 95 ++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 53 deletions(-) diff --git a/tests/runfiles/macOS-CI.run b/tests/runfiles/macOS-CI.run index c50b66068..290901c4a 100644 --- a/tests/runfiles/macOS-CI.run +++ b/tests/runfiles/macOS-CI.run @@ -22,6 +22,44 @@ failsafe = callbacks/zfs_failsafe outputdir = /var/tmp/test_results tags = ['functional'] +[tests/functional/scrub_mirror] +tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos', + 'scrub_mirror_003_pos', 'scrub_mirror_004_pos'] +tags = ['functional', 'scrub_mirror'] + +[tests/functional/cli_root/zpool_scrub] +tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos', + 'zpool_scrub_offline_device', 'zpool_scrub_multiple_copies'] +tags = ['functional', 'cli_root', 'zpool_scrub'] + +[tests/functional/resilver] +tests = ['resilver_restart_001', 'resilver_restart_002'] +tags = ['functional', 'resilver'] + +[tests/functional/cli_root/zpool_resilver] +tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart'] +tags = ['functional', 'cli_root', 'zpool_resilver'] + +[tests/functional/zvol/zvol_cli] +tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg'] +tags = ['functional', 'zvol', 'zvol_cli'] + +[tests/functional/zvol/zvol_misc] +tests = ['zvol_misc_002_pos', 'zvol_misc_hierarchy', 'zvol_misc_rename_inuse', + 'zvol_misc_snapdev', 'zvol_misc_volmode', 'zvol_misc_zil'] +tags = ['functional', 'zvol', 'zvol_misc'] + +[tests/functional/log_spacemap] +tests = ['log_spacemap_import_logs'] +pre = +post = +tags = ['functional', 'log_spacemap'] + +[tests/functional/xattr] +tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos', + 'xattr_011_pos', 'xattr_012_pos', 'xattr_013_pos'] +tags = ['functional', 'xattr'] + [tests/functional/checksum] tests = ['run_sha2_test', 'run_skein_test', 'filetest_001_pos'] tags = ['functional', 'checksum'] @@ -77,18 +115,13 @@ tags = ['functional', 'cli_root', 'zfs_rollback'] [tests/functional/cli_root/zfs_send] tests = ['zfs_send_001_pos', 'zfs_send_002_pos', 'zfs_send_003_pos', - 'zfs_send_sparse', 'zfs_send-b'] + 'zfs_send-b'] tags = ['functional', 'cli_root', 'zfs_send'] [tests/functional/cli_root/zfs_unload-key] tests = ['zfs_unload-key', 'zfs_unload-key_all', 'zfs_unload-key_recursive'] tags = ['functional', 'cli_root', 'zfs_unload-key'] -[tests/functional/cli_root/zpool_add] -tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos', - 'add-o_ashift', 'add_prop_ashift'] -tags = ['functional', 'cli_root', 'zpool_add'] - [tests/functional/cli_root/zpool_attach] tests = ['zpool_attach_001_neg', 'attach-o_ashift'] tags = ['functional', 'cli_root', 'zpool_attach'] @@ -124,7 +157,7 @@ tests = ['zpool_online_001_pos', 'zpool_online_002_neg'] tags = ['functional', 'cli_root', 'zpool_online'] [tests/functional/cli_root/zpool_remove] -tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos', +tests = ['zpool_remove_002_pos', 'zpool_remove_003_pos'] tags = ['functional', 'cli_root', 'zpool_remove'] @@ -132,15 +165,6 @@ tags = ['functional', 'cli_root', 'zpool_remove'] tests = ['zpool_replace_001_neg', 'replace-o_ashift', 'replace_prop_ashift'] tags = ['functional', 'cli_root', 'zpool_replace'] -[tests/functional/cli_root/zpool_resilver] -tests = ['zpool_resilver_bad_args', 'zpool_resilver_restart'] -tags = ['functional', 'cli_root', 'zpool_resilver'] - -[tests/functional/cli_root/zpool_scrub] -tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos', - 'zpool_scrub_offline_device', 'zpool_scrub_multiple_copies'] -tags = ['functional', 'cli_root', 'zpool_scrub'] - [tests/functional/cli_root/zpool_split] tests = ['zpool_split_cliargs', 'zpool_split_devices', 'zpool_split_resilver', 'zpool_split_indirect'] @@ -155,7 +179,7 @@ tests = ['zpool_sync_001_pos', 'zpool_sync_002_neg'] tags = ['functional', 'cli_root', 'zpool_sync'] [tests/functional/compression] -tests = ['compress_001_pos', 'compress_002_pos', 'compress_003_pos'] +tests = ['compress_003_pos'] tags = ['functional', 'compression'] [tests/functional/cp_files] @@ -219,26 +243,11 @@ tests = ['refreserv_001_pos', 'refreserv_002_pos', 'refreserv_003_pos', 'refreserv_raidz'] tags = ['functional', 'refreserv'] -[tests/functional/removal] -pre = -tests = ['removal_all_vdev', 'removal_cancel', 'removal_check_space', - 'remove_indirect'] -tags = ['functional', 'removal'] - -[tests/functional/resilver] -tests = ['resilver_restart_001', 'resilver_restart_002'] -tags = ['functional', 'resilver'] - [tests/functional/rsend] -tests = ['recv_dedup', 'recv_dedup_encrypted_zvol', 'rsend_001_pos', +tests = ['rsend_001_pos', 'send_partial_dataset'] tags = ['functional', 'rsend'] -[tests/functional/scrub_mirror] -tests = ['scrub_mirror_001_pos', 'scrub_mirror_002_pos', - 'scrub_mirror_003_pos', 'scrub_mirror_004_pos'] -tags = ['functional', 'scrub_mirror'] - [tests/functional/slog] tests = ['slog_001_pos', 'slog_002_pos', 'slog_003_pos', 'slog_004_pos', 'slog_replay_fs_002', 'slog_replay_volume'] @@ -258,23 +267,3 @@ tags = ['functional', 'upgrade'] tests = ['vdev_zaps_001_pos', 'vdev_zaps_002_pos', 'vdev_zaps_003_pos', 'vdev_zaps_007_pos'] tags = ['functional', 'vdev_zaps'] - -[tests/functional/xattr] -tests = ['xattr_001_pos', 'xattr_002_neg', 'xattr_003_neg', 'xattr_004_pos', - 'xattr_011_pos', 'xattr_012_pos', 'xattr_013_pos'] -tags = ['functional', 'xattr'] - -[tests/functional/zvol/zvol_cli] -tests = ['zvol_cli_001_pos', 'zvol_cli_002_pos', 'zvol_cli_003_neg'] -tags = ['functional', 'zvol', 'zvol_cli'] - -[tests/functional/zvol/zvol_misc] -tests = ['zvol_misc_002_pos', 'zvol_misc_hierarchy', 'zvol_misc_rename_inuse', - 'zvol_misc_snapdev', 'zvol_misc_volmode', 'zvol_misc_zil'] -tags = ['functional', 'zvol', 'zvol_misc'] - -[tests/functional/log_spacemap] -tests = ['log_spacemap_import_logs'] -pre = -post = -tags = ['functional', 'log_spacemap']