svn commit: r323037 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/cli_root/zpool_attach tests/cli_root/zpool_detach tests/cli_root/zpool_import tests/cli_root/zpool_offline ...
Alan Somers
asomers at FreeBSD.org
Wed Aug 30 22:02:38 UTC 2017
Author: asomers
Date: Wed Aug 30 22:02:34 2017
New Revision: 323037
URL: https://svnweb.freebsd.org/changeset/base/323037
Log:
More consistency in the ZFS test suite.
Move all invocations of verify_disk_count into the top of the ATF test body.
tests/sys/cddl/zfs/include/libtest.kshlib
Fix the set_disks function when only one disk is available.
Previously, its API differed depending on whether 1 or >1 disks were
available. This didn't make sense, and all tests were developed
with >1 disks.
tests/sys/cddl/zfs/tests/**/*.ksh
tests/sys/cddl/zfs/tests/**/*_test.sh
Move many verify_disk_count invocations from individual test files
into the ATF script.
tests/sys/cddl/zfs/tests/cache/*.ksh
Fix all these tests. They were using verify_disk_count in a useless
way.
tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh
Make this test work more like the other cache tests.
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/cache_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
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:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Aug 30 22:02:34 2017 (r323037)
@@ -2014,26 +2014,16 @@ function set_disks
set -A disk_array $(find_disks $DISKS)
[[ -z "$DISK_ARRAY_LIMIT" ]] && typeset -i DISK_ARRAY_LIMIT=5
- if (( ${#disk_array[*]} <= 1 )); then
- export DISK=${DISKS%% *}
- export DISK_ARRAY_NUM=1
- else
- export DISK=""
- typeset -i i=0
- while (( i < ${#disk_array[*]} && i <= $DISK_ARRAY_LIMIT )); do
- export DISK${i}="${disk_array[$i]}"
- DISKSARRAY="$DISKSARRAY ${disk_array[$i]}"
- (( i = i + 1 ))
- done
- export DISK_ARRAY_NUM=$i
- export DISKSARRAY
- fi
-
- if (( $DISK_ARRAY_NUM == 0 )); then
- export disk=$DISK
- else
- export disk=$DISK0
- fi
+ export DISK=""
+ typeset -i i=0
+ while (( i < ${#disk_array[*]} && i <= $DISK_ARRAY_LIMIT )); do
+ export DISK${i}="${disk_array[$i]}"
+ DISKSARRAY="$DISKSARRAY ${disk_array[$i]}"
+ (( i = i + 1 ))
+ done
+ export DISK_ARRAY_NUM=$i
+ export DISKSARRAY
+ export disk=$DISK0
}
#
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -55,7 +55,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "Adding an extra cache device works."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_004_neg.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -54,7 +54,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "Attaching a cache device fails."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_005_neg.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -55,7 +55,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "Replacing a cache device fails."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_006_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -57,7 +57,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "Exporting and importing pool with cache devices passes."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_007_neg.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -53,7 +53,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "A mirror/raidz/raidz2 cache is not supported."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_008_neg.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -54,7 +54,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "A raidz/raidz2 cache can not be added to existed pool."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -55,7 +55,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
log_assert "Offline and online a cache device succeed."
log_onexit cleanup
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_010_neg.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -66,12 +66,11 @@ function cleanup_testenv
log_assert "Cache device can only be disk or slice."
log_onexit cleanup_testenv
-dsk1=${DISKS%% *}
-log_must $ZPOOL create $TESTPOOL ${DISKS#$dsk1}
+log_must $ZPOOL create $TESTPOOL $VDEV
# Add nomal disk
-log_must $ZPOOL add $TESTPOOL cache $dsk1
-log_must verify_cache_device $TESTPOOL $dsk1 'ONLINE'
+log_must $ZPOOL add $TESTPOOL cache ${LDEV}
+log_must verify_cache_device $TESTPOOL ${LDEV} 'ONLINE'
# Add nomal file
log_mustnot $ZPOOL add $TESTPOOL cache $VDEV2
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_011_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -54,7 +54,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$LDEV2"
function cleanup {
if datasetexists $TESTPOOL ; then
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 Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_test.sh Wed Aug 30 22:02:34 2017 (r323037)
@@ -37,6 +37,7 @@ cache_001_pos_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -63,6 +64,7 @@ cache_002_pos_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -89,6 +91,7 @@ cache_003_pos_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -115,6 +118,7 @@ cache_004_neg_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_004_neg.ksh || atf_fail "Testcase failed"
}
@@ -141,6 +145,7 @@ cache_005_neg_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_005_neg.ksh || atf_fail "Testcase failed"
}
@@ -167,6 +172,7 @@ cache_006_pos_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -193,6 +199,7 @@ cache_007_neg_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_007_neg.ksh || atf_fail "Testcase failed"
}
@@ -219,6 +226,7 @@ cache_008_neg_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_008_neg.ksh || atf_fail "Testcase failed"
}
@@ -245,6 +253,7 @@ cache_009_pos_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_009_pos.ksh || atf_fail "Testcase failed"
}
@@ -271,6 +280,7 @@ cache_010_neg_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_010_neg.ksh || atf_fail "Testcase failed"
}
@@ -297,6 +307,7 @@ cache_011_pos_body()
. $(atf_get_srcdir)/cache.kshlib
. $(atf_get_srcdir)/cache.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/cache_011_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
DISK=${DISKS%% *}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
DISK=${DISKS%% *}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
DISK=${DISKS%% *}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
DISK=${DISKS%% *}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_online/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
DISK=${DISKS%% *}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
DISK=${DISKS%% *}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/include/libtest.kshlib
verify_runnable "global"
-verify_disk_count "$DISKS" 2
default_mirror_setup_noexit $DISK1 $DISK2
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotspare/hotspare_shared_001_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -54,7 +54,6 @@
################################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
function cleanup
{
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/poolversion/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -37,7 +37,6 @@ then
log_unsupported "zpool version property not supported on this system."
fi
-verify_disk_count "$DISKS" 2
DISKS_ARRAY=($DISKS)
# create a version 1 pool
log_must $ZPOOL create -f -o version=1 $TESTPOOL ${DISKS_ARRAY[0]}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/rsend/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -30,7 +30,6 @@
. $STF_SUITE/tests/rsend/rsend.kshlib
verify_runnable "both"
-verify_disk_count "$DISKS" 2
#
# Check if the system support 'send -R'
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/setup.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -32,7 +32,6 @@
verify_runnable "global"
echo "list of disks: $DISKS"
-verify_disk_count "$DISKS" 2
# Make sure that all of the disks that we've been given are attached to a
# SAS expander, and that we can find the phy they're attached to. This
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -62,7 +62,6 @@
###############################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
log_assert "A pool with the autoreplace property set will replace disks by physical path"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -62,8 +62,6 @@
###############################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
-
log_assert "A pool with the autoreplace property will replace disks by physical path"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -64,8 +64,6 @@
###############################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
-
log_assert "A pool with the autoreplace property will replace disks by physical path"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_003_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -55,7 +55,6 @@
###############################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
function cleanup
{
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_004_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -60,8 +60,6 @@
###############################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
-
log_assert "Removing a disk from a pool results in the spare activating"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Wed Aug 30 22:02:34 2017 (r323037)
@@ -60,8 +60,6 @@
###############################################################################
verify_runnable "global"
-verify_disk_count "$DISKS" 5
-
log_assert "zfsd will spare missing drives on startup"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Wed Aug 30 21:50:13 2017 (r323036)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh Wed Aug 30 22:02:34 2017 (r323037)
@@ -94,7 +94,7 @@ zfsd_degrade_002_pos_body()
. $(atf_get_srcdir)/../../include/default.cfg
. $(atf_get_srcdir)/zfsd.cfg
- verify_disk_count "$DISKS" 3
+ verify_disk_count "$DISKS" 5
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfsd_degrade_002_pos.ksh
if [[ $? != 0 ]]; then
@@ -504,6 +504,7 @@ zfsd_import_001_pos_body()
. $(atf_get_srcdir)/../hotspare/hotspare.kshlib
. $(atf_get_srcdir)/../hotspare/hotspare.cfg
+ verify_disk_count "$DISKS" 5
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfsd_import_001_pos.ksh || atf_fail "Testcase failed"
if [[ $? != 0 ]]; then
More information about the svn-src-projects
mailing list