Date: Wed, 30 Aug 2017 21:50:14 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r323036 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cli_root/zpool_attach tests/cli_root/zpool_destroy tests/cli_root/zpool_detach tests/cli_root/zpool_import tests/cli_ro... Message-ID: <201708302150.v7ULoE7m047996@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Wed Aug 30 21:50:13 2017 New Revision: 323036 URL: https://svnweb.freebsd.org/changeset/base/323036 Log: Remove "at_least_X_disks" kyua config variables in the ZFS test suite tests/sys/cddl/zfs/include/libtest.kshlib verify_disk_count should skip the remainder of the test on failure. tests/sys/cddl/zfs/tests/**/*_test.sh Replace ATF "require.config at_least_X_disk" statements in test case heads with "verify_disk_count" statements in test case bodies. tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh Remove a redundant verify_disk_count statement Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 21:50:13 2017 (r323036) @@ -3070,7 +3070,7 @@ function verify_disk_count typeset -i count=$(get_word_count "$1") if (( count < min )); then - log_untested "A minimum of $min disks is required to run." \ + atf_skip "A minimum of $min disks is required to run." \ " You specified $count disk(s)" fi } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_attach_001_neg cleanup zpool_attach_001_neg_head() { atf_set "descr" "Executing 'zpool attach' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_attach_001_neg_body() @@ -36,6 +35,7 @@ zpool_attach_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_attach.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -97,7 +97,6 @@ zpool_destroy_004_pos_head() { atf_set "descr" "'zpool destroy -f' should work on active pools." atf_set "require.progs" zfs zpool - atf_set "require.config" at_least_2_disks atf_set "timeout" 2000 } zpool_destroy_004_pos_body() @@ -105,6 +104,7 @@ zpool_destroy_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_destroy.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/zpool_destroy_004_pos.ksh || atf_fail "Testcase failed" } zpool_destroy_004_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_detach_001_neg cleanup zpool_detach_001_neg_head() { atf_set "descr" "Executing 'zpool detach' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_detach_001_neg_body() @@ -36,6 +35,7 @@ zpool_detach_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_detach.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_import_002_pos cleanup zpool_import_002_pos_head() { atf_set "descr" "Verify that an exported pool can be imported and cannot be imported more than once." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool sum zdb atf_set "timeout" 2400 } @@ -37,6 +36,7 @@ zpool_import_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_002_pos.ksh || atf_fail "Testcase failed" } @@ -53,7 +53,6 @@ atf_test_case zpool_import_003_pos cleanup zpool_import_003_pos_head() { atf_set "descr" "Destroyed pools are not listed unless with -D option is specified." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs atf_set "timeout" 2400 } @@ -62,6 +61,7 @@ zpool_import_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_003_pos.ksh || atf_fail "Testcase failed" } @@ -78,7 +78,6 @@ atf_test_case zpool_import_004_pos cleanup zpool_import_004_pos_head() { atf_set "descr" "Destroyed pools devices was moved to another directory,it still can be imported correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -87,6 +86,7 @@ zpool_import_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_004_pos.ksh || atf_fail "Testcase failed" } @@ -103,7 +103,6 @@ atf_test_case zpool_import_005_pos cleanup zpool_import_005_pos_head() { atf_set "descr" "Destroyed pools devices was renamed, it still can be importedcorrectly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -112,6 +111,7 @@ zpool_import_005_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_005_pos.ksh || atf_fail "Testcase failed" } @@ -128,7 +128,6 @@ atf_test_case zpool_import_006_pos cleanup zpool_import_006_pos_head() { atf_set "descr" "For mirror, N-1 destroyed pools devices was removed or usedby other pool, it still can be imported correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -137,6 +136,7 @@ zpool_import_006_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_006_pos.ksh || atf_fail "Testcase failed" } @@ -153,7 +153,6 @@ atf_test_case zpool_import_007_pos cleanup zpool_import_007_pos_head() { atf_set "descr" "For raidz, one destroyed pools devices was removed or used byother pool, it still can be imported correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -162,6 +161,7 @@ zpool_import_007_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_007_pos.ksh || atf_fail "Testcase failed" } @@ -178,7 +178,6 @@ atf_test_case zpool_import_008_pos cleanup zpool_import_008_pos_head() { atf_set "descr" "For raidz2, two destroyed pools devices was removed or used byother pool, it still can be imported correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -187,6 +186,7 @@ zpool_import_008_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_008_pos.ksh || atf_fail "Testcase failed" } @@ -203,7 +203,6 @@ atf_test_case zpool_import_009_neg cleanup zpool_import_009_neg_head() { atf_set "descr" "Badly-formed 'zpool import' with inapplicable scenariosshould return an error." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } @@ -212,6 +211,7 @@ zpool_import_009_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_009_neg.ksh || atf_fail "Testcase failed" } @@ -228,7 +228,6 @@ atf_test_case zpool_import_010_pos cleanup zpool_import_010_pos_head() { atf_set "descr" "'zpool -D -a' can import all the specified directoriesdestroyed pools." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs atf_set "timeout" 2400 } @@ -237,6 +236,7 @@ zpool_import_010_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_010_pos.ksh || atf_fail "Testcase failed" } @@ -253,7 +253,6 @@ atf_test_case zpool_import_011_neg cleanup zpool_import_011_neg_head() { atf_set "descr" "For strip pool, any destroyed pool devices was demaged,zpool import -D will failed." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -262,6 +261,7 @@ zpool_import_011_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_011_neg.ksh || atf_fail "Testcase failed" } @@ -278,7 +278,6 @@ atf_test_case zpool_import_012_pos cleanup zpool_import_012_pos_head() { atf_set "descr" "Verify all mount & share status of sub-filesystems within a poolcan be restored after import [-Df]." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool zdb share atf_set "timeout" 2400 } @@ -287,6 +286,7 @@ zpool_import_012_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_012_pos.ksh || atf_fail "Testcase failed" } @@ -303,7 +303,6 @@ atf_test_case zpool_import_013_neg cleanup zpool_import_013_neg_head() { atf_set "descr" "'zpool import' fail while pool may be in use from other system,it need import forcefully." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } @@ -313,6 +312,7 @@ zpool_import_013_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_013_neg.ksh || atf_fail "Testcase failed" } @@ -329,7 +329,6 @@ atf_test_case zpool_import_014_pos cleanup zpool_import_014_pos_head() { atf_set "descr" "'zpool import' can import destroyed disk-backed pools" - atf_set "require.config" at_least_1_disks atf_set "require.progs" zfs zpool } zpool_import_014_pos_body() @@ -337,6 +336,7 @@ zpool_import_014_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_import_014_pos.ksh || atf_fail "Testcase failed" } zpool_import_014_pos_cleanup() @@ -352,7 +352,6 @@ atf_test_case zpool_import_all_001_pos cleanup zpool_import_all_001_pos_head() { atf_set "descr" "Verify that 'zpool import -a' succeeds as root." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool sum atf_set "timeout" 2400 } @@ -362,6 +361,7 @@ zpool_import_all_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_all_001_pos.ksh || atf_fail "Testcase failed" } @@ -378,7 +378,6 @@ atf_test_case zpool_import_missing_001_pos cleanup zpool_import_missing_001_pos_head() { atf_set "descr" "Verify that import could handle damaged or missing device." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs sum zpool zdb atf_set "timeout" 2400 } @@ -387,6 +386,7 @@ zpool_import_missing_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_missing_001_pos.ksh || atf_fail "Testcase failed" } @@ -403,7 +403,6 @@ atf_test_case zpool_import_missing_002_pos cleanup zpool_import_missing_002_pos_head() { atf_set "descr" "Verify that import could handle moving device." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs zdb atf_set "timeout" 2400 } @@ -412,6 +411,7 @@ zpool_import_missing_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_missing_002_pos.ksh || atf_fail "Testcase failed" } @@ -428,7 +428,6 @@ atf_test_case zpool_import_missing_003_pos cleanup zpool_import_missing_003_pos_head() { atf_set "descr" "Verify that import could handle device overlapped." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool sum zfs atf_set "timeout" 2400 } @@ -437,6 +436,7 @@ zpool_import_missing_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_missing_003_pos.ksh || atf_fail "Testcase failed" } @@ -483,7 +483,6 @@ atf_test_case zpool_import_rename_001_pos cleanup zpool_import_rename_001_pos_head() { atf_set "descr" "Verify that an imported pool can be renamed." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool sum zdb atf_set "timeout" 2400 } @@ -492,6 +491,7 @@ zpool_import_rename_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_import_rename_001_pos.ksh || atf_fail "Testcase failed" } @@ -507,7 +507,6 @@ atf_test_case zpool_import_corrupt_001_pos cleanup zpool_import_corrupt_001_pos_head() { atf_set "descr" "Verify that a disk-backed exported pool with some of its vdev labels corrupted can still be imported" - atf_set "require.config" at_least_1_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 2400 } @@ -516,6 +515,7 @@ zpool_import_corrupt_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_import.cfg + verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/zpool_import_corrupt_001_pos.ksh || atf_fail "Testcase failed" } zpool_import_corrupt_001_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_offline_001_pos cleanup zpool_offline_001_pos_head() { atf_set "descr" "Executing 'zpool offline' with correct options succeeds" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_offline_001_pos_body() @@ -36,6 +35,7 @@ zpool_offline_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_offline_001_pos.ksh || atf_fail "Testcase failed" } @@ -52,7 +52,6 @@ atf_test_case zpool_offline_002_neg cleanup zpool_offline_002_neg_head() { atf_set "descr" "Executing 'zpool offline' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_offline_002_neg_body() @@ -60,6 +59,7 @@ zpool_offline_002_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_offline_002_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_online_001_pos cleanup zpool_online_001_pos_head() { atf_set "descr" "Executing 'zpool online' with correct options succeeds" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_online_001_pos_body() @@ -36,6 +35,7 @@ zpool_online_001_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_online.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_online_001_pos.ksh || atf_fail "Testcase failed" } @@ -52,7 +52,6 @@ atf_test_case zpool_online_002_neg cleanup zpool_online_002_neg_head() { atf_set "descr" "Executing 'zpool online' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_online_002_neg_body() @@ -60,6 +59,7 @@ zpool_online_002_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_online.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_online_002_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_replace_001_neg cleanup zpool_replace_001_neg_head() { atf_set "descr" "Executing 'zpool replace' with bad options fails" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_replace_001_neg_body() @@ -36,6 +35,7 @@ zpool_replace_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_replace.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_scrub_001_neg cleanup zpool_scrub_001_neg_head() { atf_set "descr" "Execute 'zpool scrub' using invalid parameters." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_scrub_001_neg_body() @@ -36,6 +35,7 @@ zpool_scrub_001_neg_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh || atf_fail "Testcase failed" } @@ -52,7 +52,6 @@ atf_test_case zpool_scrub_002_pos cleanup zpool_scrub_002_pos_head() { atf_set "descr" "Verify scrub -s works correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_scrub_002_pos_body() @@ -60,6 +59,7 @@ zpool_scrub_002_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_002_pos.ksh || atf_fail "Testcase failed" } @@ -76,7 +76,6 @@ atf_test_case zpool_scrub_003_pos cleanup zpool_scrub_003_pos_head() { atf_set "descr" "scrub command terminates the existing scrub process and starts a new scrub." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_scrub_003_pos_body() @@ -84,6 +83,7 @@ zpool_scrub_003_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_003_pos.ksh || atf_fail "Testcase failed" } @@ -100,7 +100,6 @@ atf_test_case zpool_scrub_004_pos cleanup zpool_scrub_004_pos_head() { atf_set "descr" "Resilver prevent scrub from starting until the resilver completes" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_scrub_004_pos_body() @@ -108,6 +107,7 @@ zpool_scrub_004_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_004_pos.ksh || atf_fail "Testcase failed" } @@ -124,7 +124,6 @@ atf_test_case zpool_scrub_005_pos cleanup zpool_scrub_005_pos_head() { atf_set "descr" "When scrubbing, detach device should not break system." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } zpool_scrub_005_pos_body() @@ -132,6 +131,7 @@ zpool_scrub_005_pos_body() . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zpool_scrub.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_scrub_005_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case zpool_upgrade_001_pos cleanup zpool_upgrade_001_pos_head() { atf_set "descr" "Executing 'zpool upgrade -v' command succeeds." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -38,6 +37,7 @@ zpool_upgrade_001_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_001_pos.ksh || atf_fail "Testcase failed" } @@ -55,7 +55,6 @@ atf_test_case zpool_upgrade_002_pos cleanup zpool_upgrade_002_pos_head() { atf_set "descr" "Import pools of all versions - zpool upgrade on each pools works" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -65,6 +64,7 @@ zpool_upgrade_002_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_002_pos.ksh || atf_fail "Testcase failed" } @@ -82,7 +82,6 @@ atf_test_case zpool_upgrade_003_pos cleanup zpool_upgrade_003_pos_head() { atf_set "descr" "Upgrading a pool that has already been upgraded succeeds." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -92,6 +91,7 @@ zpool_upgrade_003_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_003_pos.ksh || atf_fail "Testcase failed" } @@ -109,7 +109,6 @@ atf_test_case zpool_upgrade_004_pos cleanup zpool_upgrade_004_pos_head() { atf_set "descr" "zpool upgrade -a works" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -119,6 +118,7 @@ zpool_upgrade_004_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 [[ -n "$KEEP" ]] && \ atf_skip "Can't test unmount -a when pools are in KEEP" @@ -139,7 +139,6 @@ atf_test_case zpool_upgrade_005_neg cleanup zpool_upgrade_005_neg_head() { atf_set "descr" "Variations of upgrade -v print usage message,return with non-zero status" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -149,6 +148,7 @@ zpool_upgrade_005_neg_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_005_neg.ksh || atf_fail "Testcase failed" } @@ -166,7 +166,6 @@ atf_test_case zpool_upgrade_006_neg cleanup zpool_upgrade_006_neg_head() { atf_set "descr" "Attempting to upgrade a non-existent pool will return an error" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -176,6 +175,7 @@ zpool_upgrade_006_neg_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_006_neg.ksh || atf_fail "Testcase failed" } @@ -193,7 +193,6 @@ atf_test_case zpool_upgrade_007_pos cleanup zpool_upgrade_007_pos_head() { atf_set "descr" "Import pools of all versions - 'zfs upgrade' on each pools works" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool # This test can take quite a while, especially on debug bits. atf_set "timeout" 7200 @@ -205,6 +204,7 @@ zpool_upgrade_007_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_007_pos.ksh || atf_fail "Testcase failed" } @@ -222,7 +222,6 @@ atf_test_case zpool_upgrade_008_pos cleanup zpool_upgrade_008_pos_head() { atf_set "descr" "Zpool upgrade should be able to upgrade pools to a given version using -V" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -232,6 +231,7 @@ zpool_upgrade_008_pos_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_008_pos.ksh || atf_fail "Testcase failed" } @@ -249,7 +249,6 @@ atf_test_case zpool_upgrade_009_neg cleanup zpool_upgrade_009_neg_head() { atf_set "descr" "Zpool upgrade -V shouldn't be able to upgrade a pool to an unknown version" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -259,6 +258,7 @@ zpool_upgrade_009_neg_body() . $(atf_get_srcdir)/zpool_upgrade.kshlib . $(atf_get_srcdir)/zpool_upgrade.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zpool_upgrade_009_neg.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -603,7 +603,6 @@ hotspare_replace_003_neg_head() { atf_set "descr" "'zpool replace' of disabled hotspares should result in ignoring them after destroy." atf_set "require.progs" camcontrol zpool - atf_set "require.config" at_least_5_disks atf_set "timeout" 3600 } hotspare_replace_003_neg_body() @@ -613,6 +612,7 @@ hotspare_replace_003_neg_body() . $(atf_get_srcdir)/hotspare.kshlib . $(atf_get_srcdir)/hotspare.cfg + verify_disk_count "$DISKS" 5 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/hotspare_replace_003_neg.ksh || atf_fail "Testcase failed" } @@ -681,7 +681,6 @@ atf_test_case hotspare_shared_001_pos cleanup hotspare_shared_001_pos_head() { atf_set "descr" "'zpool add <pool> spare <vdev> ...' can add a disk as a shared spare to multiple pools." - atf_set "require.config" at_least_5_disks atf_set "require.progs" zpool atf_set "timeout" 3600 } @@ -691,6 +690,7 @@ hotspare_shared_001_pos_body() . $(atf_get_srcdir)/hotspare.kshlib . $(atf_get_srcdir)/hotspare.cfg + verify_disk_count "$DISKS" 5 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/hotspare_shared_001_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case online_offline_001_pos cleanup online_offline_001_pos_head() { atf_set "descr" "Turning a disk offline and back online during I/O completes." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zdb atf_set "timeout" 3600 } @@ -37,6 +36,7 @@ online_offline_001_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/online_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/online_offline_001_pos.ksh || atf_fail "Testcase failed" } online_offline_001_pos_cleanup() @@ -52,7 +52,6 @@ atf_test_case online_offline_002_neg cleanup online_offline_002_neg_head() { atf_set "descr" "Offlining a disk should fail if the pool would go critical" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zdb atf_set "timeout" 3600 } @@ -61,6 +60,7 @@ online_offline_002_neg_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/online_offline.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/online_offline_002_neg.ksh || atf_fail "Testcase failed" } online_offline_002_neg_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,13 +28,13 @@ atf_test_case poolversion_001_pos cleanup poolversion_001_pos_head() { atf_set "descr" "zpool set version can upgrade a pool" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } poolversion_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/poolversion_001_pos.ksh || atf_fail "Testcase failed" } @@ -50,13 +50,13 @@ atf_test_case poolversion_002_pos cleanup poolversion_002_pos_head() { atf_set "descr" "zpool set version can only increment pool version" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool } poolversion_002_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/poolversion_002_pos.ksh || atf_fail "Testcase failed" } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case replacement_001_pos cleanup replacement_001_pos_head() { atf_set "descr" "Replacing a disk during I/O completes." - atf_set "require.config" at_least_3_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 3600 } @@ -36,6 +35,7 @@ replacement_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 3 ksh93 $(atf_get_srcdir)/replacement_001_pos.ksh || atf_fail "Testcase failed" } replacement_001_pos_cleanup() @@ -50,7 +50,6 @@ atf_test_case replacement_002_pos cleanup replacement_002_pos_head() { atf_set "descr" "Replacing a disk during I/O completes." - atf_set "require.config" at_least_3_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 3600 } @@ -58,6 +57,7 @@ replacement_002_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 3 ksh93 $(atf_get_srcdir)/replacement_002_pos.ksh || atf_fail "Testcase failed" } replacement_002_pos_cleanup() @@ -72,7 +72,6 @@ atf_test_case replacement_003_pos cleanup replacement_003_pos_head() { atf_set "descr" "Replacing a disk during I/O completes." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 3600 } @@ -80,6 +79,7 @@ replacement_003_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/replacement_003_pos.ksh || atf_fail "Testcase failed" } replacement_003_pos_cleanup() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh Wed Aug 30 21:37:16 2017 (r323035) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/rsend_test.sh Wed Aug 30 21:50:13 2017 (r323036) @@ -28,7 +28,6 @@ atf_test_case rsend_001_pos cleanup rsend_001_pos_head() { atf_set "descr" "zfs send -R send replication stream up to the named snap." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -38,6 +37,7 @@ rsend_001_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_001_pos.ksh || atf_fail "Testcase failed" } @@ -55,7 +55,6 @@ atf_test_case rsend_002_pos cleanup rsend_002_pos_head() { atf_set "descr" "zfs send -I sends all incrementals from fs@init to fs@final." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -65,6 +64,7 @@ rsend_002_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_002_pos.ksh || atf_fail "Testcase failed" } @@ -82,7 +82,6 @@ atf_test_case rsend_003_pos cleanup rsend_003_pos_head() { atf_set "descr" "zfs send -I send all incrementals from dataset@init to clone@snap" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -92,6 +91,7 @@ rsend_003_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_003_pos.ksh || atf_fail "Testcase failed" } @@ -109,7 +109,6 @@ atf_test_case rsend_004_pos cleanup rsend_004_pos_head() { atf_set "descr" "zfs send -R -i send incremental from fs@init to fs@final." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -119,6 +118,7 @@ rsend_004_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_004_pos.ksh || atf_fail "Testcase failed" } @@ -136,7 +136,6 @@ atf_test_case rsend_005_pos cleanup rsend_005_pos_head() { atf_set "descr" "zfs send -R -I send all the incremental between @init with @final" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -146,6 +145,7 @@ rsend_005_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_005_pos.ksh || atf_fail "Testcase failed" } @@ -163,7 +163,6 @@ atf_test_case rsend_006_pos cleanup rsend_006_pos_head() { atf_set "descr" "Rename snapshot name will not change the dependent order." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -173,6 +172,7 @@ rsend_006_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_006_pos.ksh || atf_fail "Testcase failed" } @@ -190,7 +190,6 @@ atf_test_case rsend_007_pos cleanup rsend_007_pos_head() { atf_set "descr" "Rename parent filesystem name will not change the dependent order." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -200,6 +199,7 @@ rsend_007_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_007_pos.ksh || atf_fail "Testcase failed" } @@ -217,7 +217,6 @@ atf_test_case rsend_008_pos cleanup rsend_008_pos_head() { atf_set "descr" "Changes made by 'zfs promote' can be properly received." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -227,6 +226,7 @@ rsend_008_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_008_pos.ksh || atf_fail "Testcase failed" } @@ -244,7 +244,6 @@ atf_test_case rsend_009_pos cleanup rsend_009_pos_head() { atf_set "descr" "Verify zfs receive can handle out of space correctly." - atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool zfs atf_set "timeout" 2700 } @@ -254,6 +253,7 @@ rsend_009_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_009_pos.ksh || atf_fail "Testcase failed" } @@ -271,7 +271,6 @@ atf_test_case rsend_010_pos cleanup rsend_010_pos_head() { atf_set "descr" "ZFS can handle stream with multiple identical (same GUID) snapshots" - atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool atf_set "timeout" 2700 } @@ -281,6 +280,7 @@ rsend_010_pos_body() . $(atf_get_srcdir)/rsend.kshlib . $(atf_get_srcdir)/rsend.cfg + verify_disk_count "$DISKS" 2 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/rsend_010_pos.ksh || atf_fail "Testcase failed" } @@ -298,7 +298,6 @@ atf_test_case rsend_011_pos cleanup rsend_011_pos_head() { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708302150.v7ULoE7m047996>