svn commit: r329086 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/clean_mirror tests/cli_root/zpool_add tests/cli_root/zpool_create tests/cli_root/zpool_destroy tests/cli_ro...
Alan Somers
asomers at FreeBSD.org
Fri Feb 9 21:51:12 UTC 2018
Author: asomers
Date: Fri Feb 9 21:51:08 2018
New Revision: 329086
URL: https://svnweb.freebsd.org/changeset/base/329086
Log:
Remove the is_physical_device ATF variable from the ZFS test suite
It's a holdover from the Solaris days. Frankly, I'm not 100% sure why it
exists. It seems like the purpose is to skip tests that partition disks
from running with file-backed vdevs. However, that's kind of useless since
the only reason to partition disks is to get a greater number, and
file-backed vdevs are unlimited. A better solution would be to remove
partitioning from all tests; if the system has insufficient disks then just
skip the tests. Besides, FreeBSD can always use vnode-backed md(4) devices,
which are unlimited in number and can be partitioned.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh
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/setup.ksh
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_destroy/zpool_destroy_001_pos.ksh
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_remove/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_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_pool/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Fri Feb 9 21:51:08 2018 (r329086)
@@ -2982,31 +2982,13 @@ function get_substr #src_str pos offset
}
#
-# Check if the given device is physical device
-#
-function is_physical_device #device
-{
- dev_file=`find_disks $1`
- [ -c "${dev_file}" -o -b "${dev_file}" ]
-
- return $?
-}
-
-#
# Get the directory path of given device
#
function get_device_dir #device
{
typeset device=$1
- if ! $(is_physical_device $device) ; then
- if [[ $device != "/" ]]; then
- device=${device%/*}
- fi
- $ECHO $device
- else
- $ECHO "/dev"
- fi
+ $ECHO "/dev"
}
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $LDEV) ; then
- log_unsupported "Only physical disk could be cache device"
-fi
-
if [[ -d $VDEV ]]; then
log_must $RM -rf $VDIR
fi
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/clean_mirror/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $SINGLE_DISK ]]; then
log_note "Partitioning a single disk ($SINGLE_DISK)"
else
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -32,10 +32,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
#
# Use 'zpool create' to clean up the infomation in
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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ 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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -56,7 +55,6 @@ atf_test_case zpool_add_002_pos cleanup
zpool_add_002_pos_head()
{
atf_set "descr" "'zpool add -f <pool> <vdev> ...' can successfully add devices to the pool in some cases."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -84,7 +82,6 @@ atf_test_case zpool_add_003_pos cleanup
zpool_add_003_pos_head()
{
atf_set "descr" "'zpool add -n <pool> <vdev> ...' can display the configuration without actually adding devices to the pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -112,7 +109,6 @@ 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" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -140,7 +136,6 @@ 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" disks_are_physical
atf_set "require.progs" dumpadm zpool
atf_set "timeout" 2400
}
@@ -169,7 +164,6 @@ 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" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -197,7 +191,6 @@ 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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -225,7 +218,6 @@ 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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -253,7 +245,6 @@ 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" 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/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -32,10 +32,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
#
# Use 'zpool create' to clean up the infomation in
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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_create_001_pos cleanup
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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -56,7 +55,6 @@ atf_test_case zpool_create_002_pos cleanup
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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -84,7 +82,6 @@ atf_test_case zpool_create_003_pos cleanup
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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -112,7 +109,6 @@ atf_test_case zpool_create_004_pos cleanup
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" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -140,7 +136,6 @@ atf_test_case zpool_create_005_pos cleanup
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" disks_are_physical
atf_set "require.progs" zpool zfs
atf_set "timeout" 2400
}
@@ -168,7 +163,6 @@ atf_test_case zpool_create_006_pos cleanup
zpool_create_006_pos_head()
{
atf_set "descr" "Verify 'zpool create' succeed with keywords combination."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -196,7 +190,6 @@ atf_test_case zpool_create_007_neg cleanup
zpool_create_007_neg_head()
{
atf_set "descr" "'zpool create' should return an error with badly-formed parameters."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -224,7 +217,6 @@ atf_test_case zpool_create_008_pos cleanup
zpool_create_008_pos_head()
{
atf_set "descr" "'zpool create' have to use '-f' scenarios"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool format
atf_set "timeout" 2400
}
@@ -252,7 +244,6 @@ atf_test_case zpool_create_009_neg cleanup
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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -280,7 +271,6 @@ atf_test_case zpool_create_010_neg cleanup
zpool_create_010_neg_head()
{
atf_set "descr" "'zpool create' should return an error with VDEVs <64mb"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -308,7 +298,6 @@ atf_test_case zpool_create_011_neg cleanup
zpool_create_011_neg_head()
{
atf_set "descr" "'zpool create' should be failed with inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
atf_set "timeout" 2400
}
@@ -336,7 +325,6 @@ atf_test_case zpool_create_012_neg cleanup
zpool_create_012_neg_head()
{
atf_set "descr" "'zpool create' should fail with disk slice in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool swap
atf_set "timeout" 2400
}
@@ -363,7 +351,6 @@ atf_test_case zpool_create_013_neg cleanup
zpool_create_013_neg_head()
{
atf_set "descr" "'zpool create' should fail with metadevice in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" metadb metaclear metastat zpool metainit swap
atf_set "timeout" 2400
}
@@ -390,7 +377,6 @@ atf_test_case zpool_create_014_neg cleanup
zpool_create_014_neg_head()
{
atf_set "descr" "'zpool create' should fail with regular file in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs swap zpool
atf_set "timeout" 2400
}
@@ -418,7 +404,6 @@ atf_test_case zpool_create_015_neg cleanup
zpool_create_015_neg_head()
{
atf_set "descr" "'zpool create' should fail with zfs vol device in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool swap
atf_set "timeout" 2400
}
@@ -446,7 +431,6 @@ atf_test_case zpool_create_016_pos cleanup
zpool_create_016_pos_head()
{
atf_set "descr" "'zpool create' should success with no device in swap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm swapadd zpool swap
atf_set "timeout" 2400
}
@@ -474,7 +458,6 @@ atf_test_case zpool_create_017_neg cleanup
zpool_create_017_neg_head()
{
atf_set "descr" "'zpool create' should fail with mountpoint exists and not empty."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -504,7 +487,6 @@ atf_test_case zpool_create_018_pos cleanup
zpool_create_018_pos_head()
{
atf_set "descr" "zpool create can create pools with specified properties"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -532,7 +514,6 @@ atf_test_case zpool_create_019_pos cleanup
zpool_create_019_pos_head()
{
atf_set "descr" "zpool create cannot create pools specifying readonly properties"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -560,7 +541,6 @@ atf_test_case zpool_create_020_pos cleanup
zpool_create_020_pos_head()
{
atf_set "descr" "zpool create -R works as expected"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 2400
}
@@ -588,7 +568,6 @@ atf_test_case zpool_create_021_pos cleanup
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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -616,7 +595,6 @@ atf_test_case zpool_create_022_pos cleanup
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" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 2400
}
@@ -644,7 +622,6 @@ atf_test_case zpool_create_023_neg cleanup
zpool_create_023_neg_head()
{
atf_set "descr" "'zpool create -O' should return an error with badly formed parameters."
- 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_destroy/zpool_destroy_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_001_pos.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -64,10 +64,6 @@ function cleanup
set -A datasets "$TESTPOOL" "$TESTPOOL2"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This case cannot be run on raw files."
-fi
-
log_assert "'zpool destroy <pool>' can destroy a specified pool."
log_onexit cleanup
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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_destroy_001_pos cleanup
zpool_destroy_001_pos_head()
{
atf_set "descr" "'zpool destroy <pool>' can destroy a specified pool."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
}
zpool_destroy_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -30,10 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
partition_disk $SIZE $DISK 6
log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zpool_remove_001_neg cleanup
zpool_remove_001_neg_head()
{
atf_set "descr" "Check zpool remove <pool> <device> can not removeactive device from pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
}
zpool_remove_001_neg_body()
@@ -53,7 +52,6 @@ atf_test_case zpool_remove_002_pos cleanup
zpool_remove_002_pos_head()
{
atf_set "descr" "zpool remove can only remove inactive hotspare device from pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
}
zpool_remove_002_pos_body()
@@ -78,7 +76,6 @@ atf_test_case zpool_remove_003_pos cleanup
zpool_remove_003_pos_head()
{
atf_set "descr" "zpool remove can remove hotspare device which state go though active to inactive in pool"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
}
zpool_remove_003_pos_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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ 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" disks_are_physical
atf_set "require.progs" zfs zpool
}
grow_pool_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_pool/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
log_note "No spare disks available. Using slices on $DISK"
log_must partition_disk $SIZE $DISK 2
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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case grow_replicas_001_pos cleanup
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" disks_are_physical
atf_set "require.progs" zfs zpool
}
grow_replicas_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/grow_replicas/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
log_note "Creating pool type: $POOLTYPE"
if [[ -n $DISK ]]; then
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_004_neg.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -70,10 +70,6 @@ function cleanup
partition_cleanup
}
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This test cannot be run on raw files."
-fi
-
log_assert "'zpool add [-f]' will not allow a swap device to be used as a hotspare'"
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -79,10 +79,6 @@ function cleanup
partition_cleanup
}
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
log_assert "'zpool create [-f]' with hot spares should be failed " \
"with inapplicable scenarios."
log_onexit cleanup
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 Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -79,7 +79,6 @@ atf_test_case hotspare_add_003_neg cleanup
hotspare_add_003_neg_head()
{
atf_set "descr" "'zpool add [-f]' with hot spares should fail with inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 3600
}
@@ -106,7 +105,6 @@ atf_test_case hotspare_add_004_neg cleanup
hotspare_add_004_neg_head()
{
atf_set "descr" "'zpool add [-f]' will not allow a swap device to be used as a hotspare'"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool swapon swapoff swapctl
}
hotspare_add_004_neg_body()
@@ -185,7 +183,6 @@ atf_test_case hotspare_create_001_neg cleanup
hotspare_create_001_neg_head()
{
atf_set "descr" "'zpool create [-f]' with hot spares should be failedwith inapplicable scenarios."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
atf_set "timeout" 3600
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/no_space_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case enospc_001_pos cleanup
enospc_001_pos_head()
{
atf_set "descr" "ENOSPC is returned when file system is full."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
enospc_001_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/no_space/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -30,10 +30,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
DISK=${DISKS%% *}
wipe_partition_table $DISK
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case scrub_mirror_001_pos cleanup
scrub_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" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_001_pos_body()
@@ -55,7 +54,6 @@ atf_test_case scrub_mirror_002_pos cleanup
scrub_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" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_002_pos_body()
@@ -82,7 +80,6 @@ atf_test_case scrub_mirror_003_pos cleanup
scrub_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" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_003_pos_body()
@@ -109,7 +106,6 @@ atf_test_case scrub_mirror_004_pos cleanup
scrub_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" disks_are_physical
atf_set "require.progs" zfs
}
scrub_mirror_004_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/scrub_mirror/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $SINGLE_DISK ]]; then
log_note "Partitioning a single disk ($SINGLE_DISK)"
else
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -185,7 +185,6 @@ atf_test_case utils_test_007_pos cleanup
utils_test_007_pos_head()
{
atf_set "descr" "Ensure that the fstyp(1M) utility succeeds on a ZFS file system."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs fstyp
}
utils_test_007_pos_body()
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
DISK=${DISKS%% *}
wipe_partition_table $DISK
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case write_dirs_001_pos cleanup
write_dirs_001_pos_head()
{
atf_set "descr" "Creating directories with 50 big files in each, until file systemis full."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 1200
}
@@ -54,7 +53,6 @@ atf_test_case write_dirs_002_pos cleanup
write_dirs_002_pos_head()
{
atf_set "descr" "Creating directories with 5000 files in each, until file systemis full."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zpool
atf_set "timeout" 1200
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -31,10 +31,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
if [[ -n $DISK ]]; then
#
# Use 'zpool create' to clean up the infomation in
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zinject/zinject_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zinject_001_pos cleanup
zinject_001_pos_head()
{
atf_set "descr" "Verify fault inject handle content error successfully."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
@@ -55,7 +54,6 @@ atf_test_case zinject_002_pos cleanup
zinject_002_pos_head()
{
atf_set "descr" "Verify fault inject handle metadnode error successfully."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
@@ -82,7 +80,6 @@ atf_test_case zinject_003_pos cleanup
zinject_003_pos_head()
{
atf_set "descr" "Verify fault inject handle into first metadnodecause filesystem unmountable."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
@@ -109,7 +106,6 @@ atf_test_case zinject_004_pos cleanup
zinject_004_pos_head()
{
atf_set "descr" "Verify fault inject handle device error successfully."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs zpool
atf_set "timeout" 1800
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/setup.ksh Fri Feb 9 21:51:08 2018 (r329086)
@@ -32,10 +32,6 @@
verify_runnable "global"
-if ! $(is_physical_device $DISKS) ; then
- log_unsupported "This directory cannot be run on raw files."
-fi
-
default_zvol_setup $DISK $VOLSIZE
log_pass
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh Fri Feb 9 21:49:38 2018 (r329085)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh Fri Feb 9 21:51:08 2018 (r329086)
@@ -28,7 +28,6 @@ atf_test_case zvol_misc_001_neg cleanup
zvol_misc_001_neg_head()
{
atf_set "descr" "Verify that ZFS volume cannot act as dump device until dumpswap supported."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm
}
zvol_misc_001_neg_body()
@@ -53,7 +52,6 @@ atf_test_case zvol_misc_002_pos cleanup
zvol_misc_002_pos_head()
{
atf_set "descr" "Verify that ZFS volume snapshot could be fscked"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
}
zvol_misc_002_pos_body()
@@ -78,7 +76,6 @@ atf_test_case zvol_misc_003_neg cleanup
zvol_misc_003_neg_head()
{
atf_set "descr" "Verify create storage pool or newfs over dump volume is denied."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zpool
}
zvol_misc_003_neg_body()
@@ -103,7 +100,6 @@ atf_test_case zvol_misc_004_pos cleanup
zvol_misc_004_pos_head()
{
atf_set "descr" "Verify permit to create snapshot over dumpswap."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs swap
}
zvol_misc_004_pos_body()
@@ -128,7 +124,6 @@ atf_test_case zvol_misc_005_neg cleanup
zvol_misc_005_neg_head()
{
atf_set "descr" "Verify a device cannot be dump and swap at the same time."
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm swap
}
zvol_misc_005_neg_body()
@@ -153,7 +148,6 @@ atf_test_case zvol_misc_006_pos cleanup
zvol_misc_006_pos_head()
{
atf_set "descr" "zfs volume as dumpdevice should have 128k volblocksize"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" dumpadm zfs
}
zvol_misc_006_pos_body()
@@ -178,7 +172,6 @@ atf_test_case zvol_misc_007_pos cleanup
zvol_misc_007_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
atf_set "timeout" 1200
}
@@ -205,7 +198,6 @@ atf_test_case zvol_misc_008_pos cleanup
zvol_misc_008_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
atf_set "timeout" 1200
}
@@ -232,7 +224,6 @@ atf_test_case zvol_misc_009_pos cleanup
zvol_misc_009_pos_head()
{
atf_set "descr" "zfs volume device nodes are modified appropriately"
- atf_set "require.config" disks_are_physical
atf_set "require.progs" zfs
atf_set "timeout" 1200
}
More information about the svn-src-projects
mailing list