Date: Tue, 12 Apr 2016 21:29:06 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r297878 - in projects/zfsd/head/tests/sys/cddl/zfs/tests: atime bootfs cache cachefile clean_mirror/assertion_001 clean_mirror/assertion_002 clean_mirror/assertion_003 clean_mirror/asse... Message-ID: <201604122129.u3CLT6Ke050302@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Tue Apr 12 21:29:06 2016 New Revision: 297878 URL: https://svnweb.freebsd.org/changeset/base/297878 Log: Eliminiate run length atf config variables from the ZFS test suite tests/sys/cddl/zfs/tests/.../*_test.sh Remove 'atf_set "require.config" rt_(short|medium|long)' statements. They were intended to provide a quicker version of the ZFS test suite with reduced coverage. But they never worked very well, and Kyua 0.12 chokes on many of them (it doesn't allow multiple require.config lines for a single test case) Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/assertion_001_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/assertion_002_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/assertion_003_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/assertion_004_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_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_upgrade/zpool_upgrade_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/inuse/inuse_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/large_files/large_files_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/link_count/link_count_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mdb/mdb_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/migration/migration_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_read/mmap_read_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mmap/mmap_write/mmap_write_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mount/mount_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/privilege/privilege_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/quota/quota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/refquota/refquota_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/replacement/replacement_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/reservation/reservation_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/sas_phy_thrash/sas_phy_thrash_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/slog/slog_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapused/snapused_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/sparse/sparse_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/threadsappend_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/truncate/truncate_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zil/zil_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zones/zones_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/atime/atime_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case atime_001_pos cleanup atime_001_pos_head() { atf_set "descr" "Setting atime=on, the access time for files is updated when read." - atf_set "require.config" rt_short atf_set "require.progs" zfs } atime_001_pos_body() @@ -56,7 +55,6 @@ atf_test_case atime_002_neg cleanup atime_002_neg_head() { atf_set "descr" "Setting atime=off, the access time for files will not be updatedwhen read." - atf_set "require.config" rt_short atf_set "require.progs" zfs } atime_002_neg_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case bootfs_001_pos bootfs_001_pos_head() { atf_set "descr" "Valid datasets are accepted as bootfs property values" - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool zfs } bootfs_001_pos_body() @@ -45,7 +44,6 @@ atf_test_case bootfs_002_neg bootfs_002_neg_head() { atf_set "descr" "Invalid datasets are rejected as boot property values" - atf_set "require.config" rt_short atf_set "require.progs" zfs zpool } bootfs_002_neg_body() @@ -62,7 +60,6 @@ atf_test_case bootfs_003_pos bootfs_003_pos_head() { atf_set "descr" "Valid pool names are accepted by zpool set bootfs" - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool zfs } bootfs_003_pos_body() @@ -79,7 +76,6 @@ atf_test_case bootfs_004_neg bootfs_004_neg_head() { atf_set "descr" "Invalid pool names are rejected by zpool set bootfs" - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool zfs } bootfs_004_neg_body() @@ -96,7 +92,6 @@ atf_test_case bootfs_005_neg bootfs_005_neg_head() { atf_set "descr" "Boot properties cannot be set on pools with older versions" - atf_set "require.config" rt_medium atf_set "require.progs" zfs zpool } bootfs_005_neg_body() @@ -113,7 +108,6 @@ atf_test_case bootfs_006_pos bootfs_006_pos_head() { atf_set "descr" "Pools of correct vdev types accept boot property" - atf_set "require.config" rt_short atf_set "require.progs" zfs zpool mkfile } bootfs_006_pos_body() @@ -130,7 +124,6 @@ atf_test_case bootfs_007_pos bootfs_007_pos_head() { atf_set "descr" "setting bootfs on a pool which was configured with the whole disk will succeed" - atf_set "require.config" rt_short atf_set "require.progs" zfs zpool } bootfs_007_pos_body() @@ -147,7 +140,6 @@ atf_test_case bootfs_008_neg bootfs_008_neg_head() { atf_set "descr" "setting bootfs on a dataset which has gzip compression enabled will fail" - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool zfs } bootfs_008_neg_body() @@ -164,7 +156,7 @@ atf_test_case bootfs_009_neg bootfs_009_neg_head() { atf_set "descr" "Valid encrypted datasets can't be set bootfs property values" - atf_set "require.config" rt_short zfs_encryption + atf_set "require.config" zfs_encryption atf_set "require.progs" zfs zpool } bootfs_009_neg_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case cache_001_pos cleanup cache_001_pos_head() { atf_set "descr" "Creating a pool with a cache device succeeds." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -57,7 +56,6 @@ atf_test_case cache_002_pos cleanup cache_002_pos_head() { atf_set "descr" "Adding a cache device to normal pool works." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -86,7 +84,6 @@ atf_test_case cache_003_pos cleanup cache_003_pos_head() { atf_set "descr" "Adding an extra cache device works." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -115,7 +112,6 @@ atf_test_case cache_004_neg cleanup cache_004_neg_head() { atf_set "descr" "Attaching a cache device fails." - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -144,7 +140,6 @@ atf_test_case cache_005_neg cleanup cache_005_neg_head() { atf_set "descr" "Replacing a cache device fails." - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -173,7 +168,6 @@ atf_test_case cache_006_pos cleanup cache_006_pos_head() { atf_set "descr" "Exporting and importing pool with cache devices passes." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -202,7 +196,6 @@ atf_test_case cache_007_neg cleanup cache_007_neg_head() { atf_set "descr" "A mirror/raidz/raidz2 cache is not supported." - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -231,7 +224,6 @@ atf_test_case cache_008_neg cleanup cache_008_neg_head() { atf_set "descr" "A raidz/raidz2 cache can not be added to existed pool." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -260,7 +252,6 @@ atf_test_case cache_009_pos cleanup cache_009_pos_head() { atf_set "descr" "Offline and online a cache device succeed." - atf_set "require.config" rt_short atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } @@ -289,7 +280,6 @@ atf_test_case cache_010_neg cleanup cache_010_neg_head() { atf_set "descr" "Cache device can only be disk or slice." - atf_set "require.config" rt_short atf_set "require.progs" zfs zpool mkfile atf_set "timeout" 1200 } @@ -318,7 +308,6 @@ atf_test_case cache_011_pos cleanup cache_011_pos_head() { atf_set "descr" "Remove cache device from pool with spare device should succeed" - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool atf_set "timeout" 1200 } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case cachefile_001_pos cachefile_001_pos_head() { atf_set "descr" "Creating a pool with \cachefile\ set doesn't update zpool.cache" - atf_set "require.config" rt_medium atf_set "require.progs" zpool } cachefile_001_pos_body() @@ -46,7 +45,6 @@ atf_test_case cachefile_002_pos cachefile_002_pos_head() { atf_set "descr" "Importing a pool with \cachefile\ set doesn't update zpool.cache" - atf_set "require.config" rt_medium atf_set "require.progs" zpool } cachefile_002_pos_body() @@ -64,7 +62,6 @@ atf_test_case cachefile_003_pos cachefile_003_pos_head() { atf_set "descr" "Setting altroot=path and cachefile=$CPATH for zpool create succeed." - atf_set "require.config" rt_medium atf_set "require.progs" zpool } cachefile_003_pos_body() @@ -82,7 +79,6 @@ atf_test_case cachefile_004_pos cachefile_004_pos_head() { atf_set "descr" "Verify set, export and destroy when cachefile is set on pool." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool } cachefile_004_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/assertion_001_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/assertion_001_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_001/assertion_001_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case clean_mirror_001_pos clean clean_mirror_001_pos_head() { atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool" - atf_set "require.config" rt_medium } clean_mirror_001_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/assertion_002_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/assertion_002_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_002/assertion_002_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case clean_mirror_002_pos clean clean_mirror_002_pos_head() { atf_set "descr" "The primary side of a zpool mirror may be completely wipedwithout affecting the content of the pool" - atf_set "require.config" rt_medium } clean_mirror_002_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/assertion_003_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/assertion_003_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_003/assertion_003_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case clean_mirror_003_pos clean clean_mirror_003_pos_head() { atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool" - atf_set "require.config" rt_medium } clean_mirror_003_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/assertion_004_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/assertion_004_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/assertion_004/assertion_004_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case clean_mirror_004_pos clean clean_mirror_004_pos_head() { atf_set "descr" "The primary side of a zpool mirror may be completely mangledwithout affecting the content of the pool" - atf_set "require.config" rt_medium } clean_mirror_004_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,7 @@ atf_test_case zpool_add_001_pos cleanup zpool_add_001_pos_head() { atf_set "descr" "'zpool add <pool> <vdev> ...' can add devices to the pool." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -57,7 +57,7 @@ atf_test_case zpool_add_002_pos cleanup zpool_add_002_pos_head() { atf_set "descr" "'zpool add -f <pool> <vdev> ...' can successfully adddevices to the pool in some cases." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -86,7 +86,7 @@ atf_test_case zpool_add_003_pos cleanup zpool_add_003_pos_head() { atf_set "descr" "'zpool add -n <pool> <vdev> ...' can display the configurationwithout actually adding devices to the pool." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -115,7 +115,7 @@ atf_test_case zpool_add_004_pos cleanup zpool_add_004_pos_head() { atf_set "descr" "'zpool add <pool> <vdev> ...' can add zfs volume to the pool." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } @@ -145,7 +145,7 @@ atf_test_case zpool_add_005_pos cleanup zpool_add_005_pos_head() { atf_set "descr" "'zpool add' should fail with inapplicable scenarios." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" dumpadm zpool atf_set "timeout" 2400 } @@ -174,7 +174,7 @@ atf_test_case zpool_add_006_pos cleanup zpool_add_006_pos_head() { atf_set "descr" "'zpool add [-f]' can add large numbers of vdevs to the specified pool without any errors." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs mkfile zpool atf_set "timeout" 2400 } @@ -203,7 +203,7 @@ atf_test_case zpool_add_007_neg cleanup zpool_add_007_neg_head() { atf_set "descr" "'zpool add' should return an error with badly-formed parameters." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -232,7 +232,7 @@ atf_test_case zpool_add_008_neg cleanup zpool_add_008_neg_head() { atf_set "descr" "'zpool add' should return an error with nonexistent pools and vdevs" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -261,7 +261,7 @@ atf_test_case zpool_add_009_neg cleanup zpool_add_009_neg_head() { atf_set "descr" "'zpool add' should fail if vdevs are the same or vdev iscontained in the given pool." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,7 @@ atf_test_case zpool_create_001_pos clean zpool_create_001_pos_head() { atf_set "descr" "'zpool create <pool> <vspec> ...' can successfully createa new pool with a name in ZFS namespace." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" mkfile zpool atf_set "timeout" 2400 } @@ -57,7 +57,7 @@ atf_test_case zpool_create_002_pos clean zpool_create_002_pos_head() { atf_set "descr" "'zpool create -f <pool> <vspec> ...' can successfully createa new pool in some cases." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" mkfile zpool atf_set "timeout" 2400 } @@ -86,7 +86,7 @@ atf_test_case zpool_create_003_pos clean zpool_create_003_pos_head() { atf_set "descr" "'zpool create -n <pool> <vspec> ...' can display the configureationwithout actually creating the pool." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -115,7 +115,7 @@ atf_test_case zpool_create_004_pos clean zpool_create_004_pos_head() { atf_set "descr" "'zpool create [-f]' can create a storage pool with large numbers of vdevswithout any errors." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs mkfile zpool atf_set "timeout" 2400 } @@ -144,7 +144,7 @@ atf_test_case zpool_create_005_pos clean zpool_create_005_pos_head() { atf_set "descr" "'zpool create [-R root][-m mountpoint] <pool> <vdev> ...' can createan alternate pool or a new pool mounted at the specified mountpoint." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" mkfile zpool zfs atf_set "timeout" 2400 } @@ -173,7 +173,7 @@ atf_test_case zpool_create_006_pos clean zpool_create_006_pos_head() { atf_set "descr" "Verify 'zpool create' succeed with keywords combination." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" mkfile zpool atf_set "timeout" 2400 } @@ -202,7 +202,7 @@ atf_test_case zpool_create_007_neg clean zpool_create_007_neg_head() { atf_set "descr" "'zpool create' should return an error with badly-formed parameters." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -231,7 +231,7 @@ atf_test_case zpool_create_008_pos clean zpool_create_008_pos_head() { atf_set "descr" "'zpool create' have to use '-f' scenarios" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool format atf_set "timeout" 2400 } @@ -260,7 +260,7 @@ atf_test_case zpool_create_009_neg clean zpool_create_009_neg_head() { atf_set "descr" "Create a pool with same devices twice or create two pools withsame devices, 'zpool create' should fail." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -289,7 +289,7 @@ atf_test_case zpool_create_010_neg clean zpool_create_010_neg_head() { atf_set "descr" "'zpool create' should return an error with VDEVs <64mb" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs mkfile zpool atf_set "timeout" 2400 } @@ -318,7 +318,7 @@ atf_test_case zpool_create_011_neg clean zpool_create_011_neg_head() { atf_set "descr" "'zpool create' should be failed with inapplicable scenarios." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" dumpadm zpool atf_set "timeout" 2400 } @@ -347,7 +347,7 @@ atf_test_case zpool_create_012_neg clean zpool_create_012_neg_head() { atf_set "descr" "'zpool create' should fail with disk slice in swap." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool swap atf_set "timeout" 2400 } @@ -376,7 +376,7 @@ atf_test_case zpool_create_013_neg clean zpool_create_013_neg_head() { atf_set "descr" "'zpool create' should fail with metadevice in swap." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" metadb metaclear metastat zpool metainit swap atf_set "timeout" 2400 } @@ -405,7 +405,7 @@ atf_test_case zpool_create_014_neg clean zpool_create_014_neg_head() { atf_set "descr" "'zpool create' should fail with regular file in swap." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs mkfile swap zpool atf_set "timeout" 2400 } @@ -434,7 +434,7 @@ atf_test_case zpool_create_015_neg clean zpool_create_015_neg_head() { atf_set "descr" "'zpool create' should fail with zfs vol device in swap." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs zpool swap atf_set "timeout" 2400 } @@ -463,7 +463,7 @@ atf_test_case zpool_create_016_pos clean zpool_create_016_pos_head() { atf_set "descr" "'zpool create' should success with no device in swap." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" dumpadm swapadd zpool swap atf_set "timeout" 2400 } @@ -492,7 +492,7 @@ atf_test_case zpool_create_017_neg clean zpool_create_017_neg_head() { atf_set "descr" "'zpool create' should fail with mountpoint exists and not empty." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -523,7 +523,7 @@ atf_test_case zpool_create_018_pos clean zpool_create_018_pos_head() { atf_set "descr" "zpool create can create pools with specified properties" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -552,7 +552,7 @@ atf_test_case zpool_create_019_pos clean zpool_create_019_pos_head() { atf_set "descr" "zpool create cannot create pools specifying readonly properties" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -581,7 +581,7 @@ atf_test_case zpool_create_020_pos clean zpool_create_020_pos_head() { atf_set "descr" "zpool create -R works as expected" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs zpool atf_set "timeout" 2400 } @@ -610,7 +610,7 @@ atf_test_case zpool_create_021_pos clean zpool_create_021_pos_head() { atf_set "descr" "'zpool create -O property=value pool' can successfully create a poolwith correct filesystem property set." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -639,7 +639,7 @@ atf_test_case zpool_create_022_pos clean zpool_create_022_pos_head() { atf_set "descr" "'zpool create -O property=value pool' can successfully create a poolwith multiple filesystem properties set." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } @@ -668,7 +668,7 @@ atf_test_case zpool_create_023_neg clean zpool_create_023_neg_head() { atf_set "descr" "'zpool create -O' should return an error with badly formed parameters." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zpool atf_set "timeout" 2400 } 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 Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case zpool_import_002_pos clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool sum mkfile zdb atf_set "timeout" 2400 @@ -56,7 +55,6 @@ atf_test_case zpool_import_003_pos clean zpool_import_003_pos_head() { atf_set "descr" "Destroyed pools are not listed unless with -D option is specified." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs atf_set "timeout" 2400 @@ -84,7 +82,6 @@ atf_test_case zpool_import_004_pos clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -112,7 +109,6 @@ atf_test_case zpool_import_005_pos clean zpool_import_005_pos_head() { atf_set "descr" "Destroyed pools devices was renamed, it still can be importedcorrectly." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -140,7 +136,6 @@ atf_test_case zpool_import_006_pos clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -168,7 +163,6 @@ atf_test_case zpool_import_007_pos clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -196,7 +190,6 @@ atf_test_case zpool_import_008_pos clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -224,7 +217,6 @@ atf_test_case zpool_import_009_neg clean zpool_import_009_neg_head() { atf_set "descr" "Badly-formed 'zpool import' with inapplicable scenariosshould return an error." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool mkfile atf_set "timeout" 2400 @@ -252,7 +244,6 @@ atf_test_case zpool_import_010_pos clean zpool_import_010_pos_head() { atf_set "descr" "'zpool -D -a' can import all the specified directoriesdestroyed pools." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs atf_set "timeout" 2400 @@ -280,7 +271,6 @@ atf_test_case zpool_import_011_neg clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -308,7 +298,6 @@ atf_test_case zpool_import_012_pos clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool mkfile zdb share atf_set "timeout" 2400 @@ -336,7 +325,6 @@ atf_test_case zpool_import_013_neg clean 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool mkfile atf_set "timeout" 2400 @@ -365,7 +353,6 @@ atf_test_case zpool_import_014_pos clean zpool_import_014_pos_head() { atf_set "descr" "'zpool import' can import destroyed disk-backed pools" - atf_set "require.config" rt_short atf_set "require.config" at_least_1_disks atf_set "require.progs" zfs zpool } @@ -391,7 +378,6 @@ atf_test_case zpool_import_all_001_pos c zpool_import_all_001_pos_head() { atf_set "descr" "Verify that 'zpool import -a' succeeds as root." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool sum mkfile atf_set "timeout" 2400 @@ -420,7 +406,6 @@ atf_test_case zpool_import_missing_001_p zpool_import_missing_001_pos_head() { atf_set "descr" "Verify that import could handle damaged or missing device." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zfs sum zpool zdb atf_set "timeout" 2400 @@ -448,7 +433,6 @@ atf_test_case zpool_import_missing_002_p zpool_import_missing_002_pos_head() { atf_set "descr" "Verify that import could handle moving device." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool zfs zdb atf_set "timeout" 2400 @@ -476,7 +460,6 @@ atf_test_case zpool_import_missing_003_p zpool_import_missing_003_pos_head() { atf_set "descr" "Verify that import could handle device overlapped." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" mkfile zpool sum zfs atf_set "timeout" 2400 @@ -503,7 +486,6 @@ atf_test_case zpool_import_missing_004_p zpool_import_missing_004_pos_head() { atf_set "descr" "Verify that zpool import succeeds when devices are missing" - atf_set "require.config" rt_short atf_set "require.progs" mkfile zfs zpool atf_set "timeout" 300 } @@ -537,7 +519,6 @@ atf_test_case zpool_import_rename_001_po zpool_import_rename_001_pos_head() { atf_set "descr" "Verify that an imported pool can be renamed." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zfs zpool sum mkfile zdb atf_set "timeout" 2400 @@ -564,7 +545,6 @@ atf_test_case zpool_import_corrupt_001_p 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" rt_medium atf_set "require.config" at_least_1_disks atf_set "require.progs" zfs zpool zdb atf_set "timeout" 2400 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 Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case zpool_upgrade_001_pos clea zpool_upgrade_001_pos_head() { atf_set "descr" "Executing 'zpool upgrade -v' command succeeds." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -58,7 +57,6 @@ atf_test_case zpool_upgrade_002_pos clea zpool_upgrade_002_pos_head() { atf_set "descr" "Import pools of all versions - zpool upgrade on each pools works" - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -88,7 +86,6 @@ atf_test_case zpool_upgrade_003_pos clea zpool_upgrade_003_pos_head() { atf_set "descr" "Upgrading a pool that has already been upgraded succeeds." - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -118,7 +115,6 @@ atf_test_case zpool_upgrade_004_pos clea zpool_upgrade_004_pos_head() { atf_set "descr" "zpool upgrade -a works" - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -151,7 +147,6 @@ atf_test_case zpool_upgrade_005_neg clea zpool_upgrade_005_neg_head() { atf_set "descr" "Variations of upgrade -v print usage message,return with non-zero status" - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -181,7 +176,6 @@ atf_test_case zpool_upgrade_006_neg clea zpool_upgrade_006_neg_head() { atf_set "descr" "Attempting to upgrade a non-existent pool will return an error" - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -211,7 +205,6 @@ atf_test_case zpool_upgrade_007_pos clea zpool_upgrade_007_pos_head() { atf_set "descr" "Import pools of all versions - 'zfs upgrade' on each pools works" - atf_set "require.config" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool # This test can take quite a while, especially on debug bits. @@ -243,7 +236,6 @@ atf_test_case zpool_upgrade_008_pos clea 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 @@ -273,7 +265,6 @@ atf_test_case zpool_upgrade_009_neg clea 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" rt_medium atf_set "require.config" at_least_2_disks atf_set "require.progs" zpool atf_set "timeout" 1800 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case compress_001_pos cleanup compress_001_pos_head() { atf_set "descr" "Ensure that compressed files are smaller." - atf_set "require.config" rt_long atf_set "require.progs" zfs } compress_001_pos_body() @@ -54,7 +53,6 @@ atf_test_case compress_003_pos cleanup compress_003_pos_head() { atf_set "descr" "Changing blocksize doesn't casue system panic with compression settings" - atf_set "require.config" rt_long atf_set "require.progs" zfs mkfile } compress_003_pos_body() @@ -80,7 +78,6 @@ atf_test_case compress_004_pos cleanup compress_004_pos_head() { atf_set "descr" "Creating non-power-of-2 blocksize file and freeing the filestorage space at will should work normally with compression setting" - atf_set "require.config" rt_long atf_set "require.progs" zfs } compress_004_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/ctime/ctime_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case ctime_001_pos cleanup ctime_001_pos_head() { atf_set "descr" "A file's ctime should change when the file is modified" - atf_set "require.config" rt_short atf_set "require.progs" zfs } ctime_001_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/zfs_allow_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -325,7 +325,6 @@ atf_test_case zfs_allow_012_neg cleanup zfs_allow_012_neg_head() { atf_set "descr" "Verify privileged user can not use permissions properly whendelegation property is set off" - atf_set "require.config" rt_medium atf_set "require.progs" zfs zpool svcs } zfs_allow_012_neg_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/devices/devices_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case devices_001_pos cleanup devices_001_pos_head() { atf_set "descr" "Setting devices=on on file system, the devices files in this filesystem can be used." - atf_set "require.config" rt_short atf_set "require.progs" zfs } devices_001_pos_body() @@ -57,7 +56,6 @@ atf_test_case devices_002_neg cleanup devices_002_neg_head() { atf_set "descr" "Setting devices=off on file system, the devices files in this filesystem can not be used." - atf_set "require.config" rt_short atf_set "require.progs" zfs } devices_002_neg_body() @@ -86,7 +84,6 @@ atf_test_case devices_003_pos cleanup devices_003_pos_head() { atf_set "descr" "Writing random data into /dev/zfs should do no harm." - atf_set "require.config" rt_short } devices_003_pos_body() { Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/exec/exec_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case exec_001_pos cleanup exec_001_pos_head() { atf_set "descr" "Setting exec=on on a filesystem, processes can be executed fromthis file system." - atf_set "require.config" rt_short atf_set "require.progs" zfs } exec_001_pos_body() @@ -53,7 +52,6 @@ atf_test_case exec_002_neg cleanup exec_002_neg_head() { atf_set "descr" "Setting exec=off on a filesystem, processes can not be executedfrom this file system." - atf_set "require.config" rt_short atf_set "require.progs" zfs } exec_002_neg_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,7 @@ atf_test_case grow_pool_001_pos cleanup grow_pool_001_pos_head() { atf_set "descr" "A zpool may be increased in capacity by adding a disk" - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs zpool } grow_pool_001_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,7 @@ atf_test_case grow_replicas_001_pos clea grow_replicas_001_pos_head() { atf_set "descr" "A zpool mirror/raidz may be increased in capacity by adding a disk." - atf_set "require.config" rt_medium disks_are_physical + atf_set "require.config" disks_are_physical atf_set "require.progs" zfs zpool } grow_replicas_001_pos_body() Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/history/history_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case history_001_pos history_001_pos_head() { atf_set "descr" "Verify zpool sub-commands which modify state are logged." - atf_set "require.config" rt_medium atf_set "require.progs" mkfile zpool nawk atf_set "timeout" 1800 } @@ -46,7 +45,6 @@ atf_test_case history_002_pos cleanup history_002_pos_head() { atf_set "descr" "Verify zfs sub-commands which modify state are logged." - atf_set "require.config" rt_medium atf_set "require.progs" zfs zpool atf_set "timeout" 1800 } @@ -75,7 +73,6 @@ atf_test_case history_003_pos cleanup history_003_pos_head() { atf_set "descr" "zpool history limitation test." - atf_set "require.config" rt_long atf_set "require.progs" zpool zfs atf_set "timeout" 1800 } @@ -104,7 +101,6 @@ atf_test_case history_004_pos cleanup history_004_pos_head() { atf_set "descr" "'zpool history' can copes with many simultaneous command." - atf_set "require.config" rt_medium atf_set "require.progs" zfs zpool atf_set "timeout" 1800 } @@ -133,7 +129,6 @@ atf_test_case history_005_neg cleanup history_005_neg_head() { atf_set "descr" "Verify 'zpool list|status|iostat' will not be logged." - atf_set "require.config" rt_short atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -162,7 +157,6 @@ atf_test_case history_006_neg cleanup history_006_neg_head() { atf_set "descr" "Verify 'zfs list|get|mount|unmount|share|unshare|send' will notbe logged." - atf_set "require.config" rt_short atf_set "require.progs" zfs zpool atf_set "timeout" 1800 } @@ -191,7 +185,6 @@ atf_test_case history_007_pos cleanup history_007_pos_head() { atf_set "descr" "Verify command history moves with pool while migrating." - atf_set "require.config" rt_short atf_set "require.progs" zpool atf_set "timeout" 1800 } @@ -220,7 +213,6 @@ atf_test_case history_008_pos cleanup history_008_pos_head() { atf_set "descr" "Internal journal records all the recursively operations." - atf_set "require.config" rt_medium atf_set "require.progs" zfs zpool atf_set "timeout" 1800 } @@ -249,7 +241,6 @@ atf_test_case history_009_pos cleanup history_009_pos_head() { atf_set "descr" "Verify the delegation internal history are correctly." - atf_set "require.config" rt_long atf_set "require.progs" zfs zpool atf_set "timeout" 1800 } @@ -278,7 +269,6 @@ atf_test_case history_010_pos cleanup history_010_pos_head() { atf_set "descr" "Verify internal long history information are correct." - atf_set "require.config" rt_short atf_set "require.progs" zfs zpool atf_set "timeout" 1800 } Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Tue Apr 12 21:23:44 2016 (r297877) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Tue Apr 12 21:29:06 2016 (r297878) @@ -28,7 +28,6 @@ atf_test_case hotplug_001_pos cleanup hotplug_001_pos_head() { atf_set "descr" "When removing a device from a redundant pool, the device'sstate will be indicated as 'REMOVED'. No FMA faulty message." - atf_set "require.config" rt_long atf_set "require.progs" mkfile zpool lofiadm atf_set "timeout" 1800 } @@ -57,7 +56,6 @@ atf_test_case hotplug_002_pos cleanup hotplug_002_pos_head() { atf_set "descr" "When removing and reinserting a device, the device status isONLINE with no FMA errors." - atf_set "require.config" rt_long atf_set "require.progs" mkfile zpool lofiadm atf_set "timeout" 1800 } @@ -86,7 +84,6 @@ atf_test_case hotplug_003_pos cleanup hotplug_003_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?201604122129.u3CLT6Ke050302>