svn commit: r353379 - head/tests/sys/cddl/zfs/tests/cli_root/zpool_add
Alan Somers
asomers at FreeBSD.org
Thu Oct 10 02:17:48 UTC 2019
Author: asomers
Date: Thu Oct 10 02:17:45 2019
New Revision: 353379
URL: https://svnweb.freebsd.org/changeset/base/353379
Log:
zfs: multiple improvements to the zpool_add tests
* Don't partition a disk if too few are available. Just rely on Kyua to
ensure that the tests aren't run with insufficient disks.
* Remove redundant cleanup steps
* In zpool_add_003_pos, store the temporary file in $PWD so Kyua will
automatically clean it up.
* Update zpool_add_005_pos to use dumpon instead of dumpadm. This test had
never been ported to FreeBSD.
* In zpool_add_005_pos, don't format the dump disk with UFS. That was
pointless.
MFC after: 2 weeks
Sponsored by: Axcient
Modified:
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/cleanup.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_001_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_002_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_003_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_004_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_005_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_006_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_007_neg.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_008_neg.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_009_neg.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_010_pos.ksh
head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/cleanup.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/cleanup.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/cleanup.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -32,6 +32,8 @@
. $STF_SUITE/include/libtest.kshlib
. $STF_SUITE/tests/cli_root/zpool_add/zpool_add.kshlib
+poolexists $TESTPOOL && \
+ destroy_pool $TESTPOOL
cleanup_devices $DISKS
log_pass
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/setup.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -34,19 +34,4 @@
verify_runnable "global"
-if [[ -n $DISK ]]; then
- #
- # Use 'zpool create' to clean up the infomation in
- # in the given disk to avoid slice overlapping.
- #
- cleanup_devices $DISK
-
- partition_disk $SIZE $DISK 7
-else
- for disk in `$ECHO $DISKSARRAY`; do
- cleanup_devices $disk
- partition_disk $SIZE $disk 7
- done
-fi
-
log_pass
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_001_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_001_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_001_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -58,45 +58,24 @@
verify_runnable "global"
-function cleanup
-{
- poolexists $TESTPOOL && \
- destroy_pool $TESTPOOL
-
- partition_cleanup
-}
-
log_assert "'zpool add <pool> <vdev> ...' can add devices to the pool."
-log_onexit cleanup
-
set -A keywords "" "mirror" "raidz" "raidz1" "spare"
-typeset diskname=${disk#/dev/}
+set_disks
+
typeset diskname0=${DISK0#/dev/}
typeset diskname1=${DISK1#/dev/}
+typeset diskname2=${DISK2#/dev/}
+typeset diskname3=${DISK3#/dev/}
+typeset diskname4=${DISK4#/dev/}
-case $DISK_ARRAY_NUM in
-0|1)
- pooldevs="${diskname}p1 \
- /dev/${diskname}p1 \
- \"${diskname}p1 ${diskname}p2\""
- mirrordevs="\"/dev/${diskname}p1 ${diskname}p2\""
- raidzdevs="\"/dev/${diskname}p1 ${diskname}p2\""
+pooldevs="${diskname0}\
+ \"/dev/${diskname0} ${diskname1}\" \
+ \"${diskname0} ${diskname1} ${diskname2}\""
+mirrordevs="\"/dev/${diskname0} ${diskname1}\""
+raidzdevs="\"/dev/${diskname0} ${diskname1}\""
- ;;
-2|*)
- pooldevs="${diskname0}p1\
- \"/dev/${diskname0}p1 ${diskname1}p1\" \
- \"${diskname0}p1 ${diskname0}p2 ${diskname1}p2\"\
- \"${diskname0}p1 ${diskname1}p1 ${diskname0}p2\
- ${diskname1}p2\""
- mirrordevs="\"/dev/${diskname0}p1 ${diskname1}p1\""
- raidzdevs="\"/dev/${diskname0}p1 ${diskname1}p1\""
-
- ;;
-esac
-
typeset -i i=0
typeset vdev
eval set -A poolarray $pooldevs
@@ -107,7 +86,7 @@ while (( $i < ${#keywords[*]} )); do
case ${keywords[i]} in
""|spare)
for vdev in "${poolarray[@]}"; do
- create_pool "$TESTPOOL" "${diskname}p6"
+ create_pool "$TESTPOOL" "${diskname3}"
log_must poolexists "$TESTPOOL"
log_must $ZPOOL add -f "$TESTPOOL" ${keywords[i]} \
$vdev
@@ -119,7 +98,7 @@ while (( $i < ${#keywords[*]} )); do
mirror)
for vdev in "${mirrorarray[@]}"; do
create_pool "$TESTPOOL" "${keywords[i]}" \
- "${diskname}p4" "${diskname}p5"
+ "${diskname3}" "${diskname4}"
log_must poolexists "$TESTPOOL"
log_must $ZPOOL add "$TESTPOOL" ${keywords[i]} \
$vdev
@@ -131,7 +110,7 @@ while (( $i < ${#keywords[*]} )); do
raidz|raidz1)
for vdev in "${raidzarray[@]}"; do
create_pool "$TESTPOOL" "${keywords[i]}" \
- "${diskname}p4" "${diskname}p5"
+ "${diskname3}" "${diskname4}"
log_must poolexists "$TESTPOOL"
log_must $ZPOOL add "$TESTPOOL" ${keywords[i]} \
$vdev
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_002_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_002_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_002_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -60,26 +60,18 @@
verify_runnable "global"
-function cleanup
-{
- poolexists $TESTPOOL && \
- destroy_pool $TESTPOOL
+set_disks
- partition_cleanup
-}
-
log_assert "'zpool add -f <pool> <vdev> ...' can successfully add" \
"devices to the pool in some cases."
-log_onexit cleanup
-
-create_pool "$TESTPOOL" mirror "${disk}p1" "${disk}p2"
+create_pool "$TESTPOOL" mirror "${DISK0}" "${DISK1}"
log_must poolexists "$TESTPOOL"
-log_mustnot $ZPOOL add "$TESTPOOL" ${disk}p3
-log_mustnot iscontained "$TESTPOOL" "${disk}p3"
+log_mustnot $ZPOOL add "$TESTPOOL" ${DISK2}
+log_mustnot iscontained "$TESTPOOL" "${DISK2}"
-log_must $ZPOOL add -f "$TESTPOOL" ${disk}p3
-log_must iscontained "$TESTPOOL" "${disk}p3"
+log_must $ZPOOL add -f "$TESTPOOL" ${DISK2}
+log_must iscontained "$TESTPOOL" "${DISK2}"
log_pass "'zpool add -f <pool> <vdev> ...' executes successfully."
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_003_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_003_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_003_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -58,30 +58,19 @@
verify_runnable "global"
-function cleanup
-{
- poolexists $TESTPOOL && \
- destroy_pool $TESTPOOL
+set_disks
- partition_cleanup
-
- [[ -e $tmpfile ]] && \
- log_must $RM -f $tmpfile
-}
-
log_assert "'zpool add -n <pool> <vdev> ...' can display the configuration" \
"without actually adding devices to the pool."
-log_onexit cleanup
+tmpfile="zpool_add_003.tmp${TESTCASE_ID}"
-tmpfile="$TMPDIR/zpool_add_003.tmp${TESTCASE_ID}"
-
-create_pool "$TESTPOOL" "${disk}p1"
+create_pool "$TESTPOOL" "${DISK0}"
log_must poolexists "$TESTPOOL"
-$ZPOOL add -n "$TESTPOOL" ${disk}p2 > $tmpfile
+$ZPOOL add -n "$TESTPOOL" ${DISK1} > $tmpfile
-log_mustnot iscontained "$TESTPOOL" "${disk}p2"
+log_mustnot iscontained "$TESTPOOL" "${DISK1}"
str="would update '$TESTPOOL' to the following configuration:"
$CAT $tmpfile | $GREP "$str" >/dev/null 2>&1
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_004_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_004_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_004_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -58,6 +58,8 @@
verify_runnable "global"
+set_disks
+
function cleanup
{
poolexists $TESTPOOL && \
@@ -67,19 +69,16 @@ function cleanup
log_must $ZFS destroy -f $TESTPOOL1/$TESTVOL
poolexists $TESTPOOL1 && \
destroy_pool "$TESTPOOL1"
-
- partition_cleanup
-
}
log_assert "'zpool add <pool> <vdev> ...' can add zfs volume to the pool."
log_onexit cleanup
-create_pool "$TESTPOOL" "${disk}p1"
+create_pool "$TESTPOOL" "${DISK0}"
log_must poolexists "$TESTPOOL"
-create_pool "$TESTPOOL1" "${disk}p2"
+create_pool "$TESTPOOL1" "${DISK1}"
log_must poolexists "$TESTPOOL1"
log_must $ZFS create -V $VOLSIZE $TESTPOOL1/$TESTVOL
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_005_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_005_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_005_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -61,6 +61,8 @@
verify_runnable "global"
+set_disks
+
function cleanup
{
poolexists "$TESTPOOL" && \
@@ -68,11 +70,7 @@ function cleanup
poolexists "$TESTPOOL1" && \
destroy_pool "$TESTPOOL1"
- if [[ -n $saved_dump_dev ]]; then
- log_must eval "$DUMPADM -u -d $saved_dump_dev > /dev/null"
- fi
-
- partition_cleanup
+ $DUMPON -r $dump_dev
}
log_assert "'zpool add' should fail with inapplicable scenarios."
@@ -81,22 +79,20 @@ log_onexit cleanup
mnttab_dev=$(find_mnttab_dev)
vfstab_dev=$(find_vfstab_dev)
-saved_dump_dev=$(save_dump_dev)
-dump_dev=${disk}p3
+dump_dev=${DISK2}
-create_pool "$TESTPOOL" "${disk}p1"
+create_pool "$TESTPOOL" "${DISK0}"
log_must poolexists "$TESTPOOL"
-create_pool "$TESTPOOL1" "${disk}p2"
+create_pool "$TESTPOOL1" "${DISK1}"
log_must poolexists "$TESTPOOL1"
-log_mustnot $ZPOOL add -f "$TESTPOOL" ${disk}p2
+log_mustnot $ZPOOL add -f "$TESTPOOL" ${DISK1}
log_mustnot $ZPOOL add -f "$TESTPOOL" $mnttab_dev
log_mustnot $ZPOOL add -f "$TESTPOOL" $vfstab_dev
-log_must $ECHO "y" | $NEWFS /dev/$dump_dev > /dev/null 2>&1
-log_must $DUMPADM -u -d /dev/$dump_dev > /dev/null
+log_must $DUMPON $dump_dev
log_mustnot $ZPOOL add -f "$TESTPOOL" $dump_dev
log_pass "'zpool add' should fail with inapplicable scenarios."
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_006_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_006_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_006_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -66,16 +66,12 @@ function cleanup
poolexists $TESTPOOL1 && \
destroy_pool $TESTPOOL1
- datasetexists $TESTPOOL/$TESTFS && \
- log_must $ZFS destroy -f $TESTPOOL/$TESTFS
poolexists $TESTPOOL && \
destroy_pool $TESTPOOL
if [[ -d $TESTDIR ]]; then
log_must $RM -rf $TESTDIR
fi
-
- partition_cleanup
}
@@ -101,7 +97,6 @@ function setup_vdevs #<disk>
# Minus $largest_num/20 to leave 5% space for metadata.
(( vdevs_num=largest_num - largest_num/20 ))
file_size=64
- vdev=$disk
else
vdevs_num=$VDEVS_NUM
(( file_size = fs_size / (1024 * 1024 * (vdevs_num + vdevs_num/20)) ))
@@ -112,8 +107,8 @@ function setup_vdevs #<disk>
(( slice_size = file_size * (vdevs_num + vdevs_num/20) ))
wipe_partition_table $disk
set_partition 0 "" ${slice_size}m $disk
- vdev=${disk}p1
fi
+ vdev=${disk}
create_pool $TESTPOOL $vdev
[[ -d $TESTDIR ]] && \
@@ -143,17 +138,11 @@ log_assert " 'zpool add [-f]' can add large numbers of
" pool without any errors."
log_onexit cleanup
-if [[ $DISK_ARRAY_NUM == 0 ]]; then
- disk=$DISK
-else
- disk=$DISK0
-fi
-
vdevs_list=""
vdevs_num=$VDEVS_NUM
file_size=$FILE_SIZE
-setup_vdevs $disk
+setup_vdevs $DISK0
log_must $ZPOOL add -f "$TESTPOOL1" $vdevs_list
log_must iscontained "$TESTPOOL1" "$vdevs_list"
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_007_neg.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_007_neg.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_007_neg.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -57,22 +57,14 @@
verify_runnable "global"
-function cleanup
-{
- poolexists "$TESTPOOL" && \
- destroy_pool "$TESTPOOL"
-
- partition_cleanup
-}
+set_disks
log_assert "'zpool add' should return an error with badly-formed parameters."
-log_onexit cleanup
-
set -A args "" "-f" "-n" "-?" "-nf" "-fn" "-f -n" "--f" "-blah" \
- "-? $TESTPOOL ${disk}p2"
+ "-? $TESTPOOL ${DISK1}"
-create_pool "$TESTPOOL" "${disk}p1"
+create_pool "$TESTPOOL" "${DISK0}"
log_must poolexists "$TESTPOOL"
typeset -i i=0
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_008_neg.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_008_neg.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_008_neg.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -57,23 +57,12 @@
verify_runnable "global"
-function cleanup
-{
-
- poolexists "$TESTPOOL" && \
- destroy_pool "$TESTPOOL"
-
- partition_cleanup
-}
-
log_assert "'zpool add' should return an error with nonexistent pools and vdevs"
-log_onexit cleanup
-
-set -A args "" "-f nonexistent_pool ${disk}p2" \
+set -A args "" "-f nonexistent_pool ${DISK1}" \
"-f $TESTPOOL nonexistent_vdev"
-create_pool "$TESTPOOL" "${disk}p1"
+create_pool "$TESTPOOL" "${DISK0}"
log_must poolexists "$TESTPOOL"
typeset -i i=0
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_009_neg.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_009_neg.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_009_neg.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -58,26 +58,14 @@
verify_runnable "global"
-function cleanup
-{
-
- poolexists "$TESTPOOL" && \
- destroy_pool "$TESTPOOL"
-
- partition_cleanup
-
-}
-
log_assert "'zpool add' should fail if vdevs are the same or vdev is " \
"contained in the given pool."
-log_onexit cleanup
-
-create_pool "$TESTPOOL" "${disk}p1"
+create_pool "$TESTPOOL" "${DISK1}"
log_must poolexists "$TESTPOOL"
-log_mustnot $ZPOOL add -f "$TESTPOOL" ${disk}p2 ${disk}p2
-log_mustnot $ZPOOL add -f "$TESTPOOL" ${disk}p1
+log_mustnot $ZPOOL add -f "$TESTPOOL" ${DISK0} ${DISK0}
+log_mustnot $ZPOOL add -f "$TESTPOOL" ${DISK1}
log_pass "'zpool add' get fail as expected if vdevs are the same or vdev is " \
"contained in the given pool."
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_010_pos.ksh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_010_pos.ksh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_010_pos.ksh Thu Oct 10 02:17:45 2019 (r353379)
@@ -31,17 +31,7 @@
verify_runnable "global"
-function cleanup
-{
- poolexists $TESTPOOL && \
- destroy_pool $TESTPOOL
-
- partition_cleanup
-}
-
log_assert "'zpool add' can add devices, even if a replacing vdev with a spare child is present"
-
-log_onexit cleanup
create_pool $TESTPOOL mirror ${DISK0} ${DISK1}
# A replacing vdev will automatically detach the older member when resilvering
Modified: head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh
==============================================================================
--- head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Wed Oct 9 23:35:42 2019 (r353378)
+++ head/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh Thu Oct 10 02:17:45 2019 (r353379)
@@ -39,7 +39,7 @@ zpool_add_001_pos_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 2
+ verify_disk_count "$DISKS" 5
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -66,7 +66,7 @@ zpool_add_002_pos_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 3
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -93,7 +93,7 @@ zpool_add_003_pos_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -120,6 +120,7 @@ zpool_add_004_pos_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
+ verify_disk_count "$DISKS" 2
verify_zvol_recursive
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_004_pos.ksh || atf_fail "Testcase failed"
@@ -138,7 +139,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.progs" dumpadm zpool
+ atf_set "require.progs" zpool
atf_set "timeout" 2400
}
zpool_add_005_pos_body()
@@ -147,8 +148,8 @@ zpool_add_005_pos_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 1
- verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 3
+ atf_expect_fail "PR 241070 dumpon opens geom devices non-exclusively"
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_005_pos.ksh || atf_fail "Testcase failed"
}
@@ -175,7 +176,7 @@ zpool_add_006_pos_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 2
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -202,7 +203,7 @@ zpool_add_007_neg_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_007_neg.ksh || atf_fail "Testcase failed"
}
@@ -229,7 +230,7 @@ zpool_add_008_neg_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_008_neg.ksh || atf_fail "Testcase failed"
}
@@ -256,7 +257,7 @@ zpool_add_009_neg_body()
. $(atf_get_srcdir)/zpool_add.kshlib
. $(atf_get_srcdir)/zpool_add.cfg
- verify_disk_count "$DISKS" 1
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_009_neg.ksh || atf_fail "Testcase failed"
}
More information about the svn-src-all
mailing list