svn commit: r323117 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user: misc zfs_list zpool_iostat zpool_list
Alan Somers
asomers at FreeBSD.org
Fri Sep 1 20:12:20 UTC 2017
Author: asomers
Date: Fri Sep 1 20:12:18 2017
New Revision: 323117
URL: https://svnweb.freebsd.org/changeset/base/323117
Log:
Skip cli_user tests when insufficient disks are available
tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh
tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh
tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh
Add appropriate verify_disk_count calls
tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh
tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh
Fix these tests so they won't attempt to add a disk that's already
in use.
Sponsored by: Spectra Logic Corp
Modified:
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh
projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Fri Sep 1 20:03:03 2017 (r323116)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh Fri Sep 1 20:12:18 2017 (r323117)
@@ -37,6 +37,7 @@ zdb_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zdb_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -62,6 +63,7 @@ zfs_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -87,6 +89,7 @@ zfs_allow_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_allow_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -112,6 +115,7 @@ zfs_clone_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_clone_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -137,6 +141,7 @@ zfs_create_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_create_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -162,6 +167,7 @@ zfs_destroy_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_destroy_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -187,6 +193,7 @@ zfs_get_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_get_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -212,6 +219,7 @@ zfs_inherit_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_inherit_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -237,6 +245,7 @@ zfs_mount_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_mount_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -262,6 +271,7 @@ zfs_promote_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_promote_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -287,6 +297,7 @@ zfs_receive_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_receive_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -312,6 +323,7 @@ zfs_rename_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_rename_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -337,6 +349,7 @@ zfs_rollback_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_rollback_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -362,6 +375,7 @@ zfs_send_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_send_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -387,6 +401,7 @@ zfs_set_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_set_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -412,6 +427,7 @@ zfs_share_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_share_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -437,6 +453,7 @@ zfs_snapshot_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_snapshot_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -462,6 +479,7 @@ zfs_unallow_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unallow_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -487,6 +505,7 @@ zfs_unmount_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unmount_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -512,6 +531,7 @@ zfs_unshare_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_unshare_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -537,6 +557,7 @@ zfs_upgrade_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_upgrade_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -562,6 +583,7 @@ zpool_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -587,6 +609,7 @@ zpool_add_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -612,6 +635,7 @@ zpool_add_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 2
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_add_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -637,6 +661,7 @@ zpool_attach_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_attach_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -662,6 +687,7 @@ zpool_clear_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_clear_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -686,6 +712,7 @@ zpool_create_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/zpool_create_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -701,6 +728,7 @@ zpool_create_002_pos_body()
{
. $(atf_get_srcdir)/../../../include/default.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/zpool_create_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -718,6 +746,7 @@ zpool_destroy_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_destroy_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -743,6 +772,7 @@ zpool_detach_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_detach_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -768,6 +798,7 @@ zpool_export_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_export_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -793,6 +824,7 @@ zpool_get_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_get_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -818,6 +850,7 @@ zpool_history_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_history_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -843,6 +876,7 @@ zpool_import_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_import_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -868,6 +902,7 @@ zpool_import_002_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_import_002_neg.ksh || atf_fail "Testcase failed"
}
@@ -893,6 +928,7 @@ zpool_offline_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_offline_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -918,6 +954,7 @@ zpool_online_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_online_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -943,6 +980,7 @@ zpool_remove_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_remove_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -968,6 +1006,7 @@ zpool_replace_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_replace_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -993,6 +1032,7 @@ zpool_scrub_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_scrub_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -1018,6 +1058,7 @@ zpool_set_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_set_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -1043,6 +1084,7 @@ zpool_status_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_status_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -1068,6 +1110,7 @@ zpool_upgrade_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/misc.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_upgrade_001_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh Fri Sep 1 20:03:03 2017 (r323116)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_001_neg.ksh Fri Sep 1 20:12:18 2017 (r323117)
@@ -55,13 +55,9 @@
verify_runnable "global"
-ADD_DISK="${DISKS%% }"
-ADD_DISK="${ADD_DISK##* }"
+set_disks
-[[ -z $ADD_DISK ]] && \
- log_fail "No spare disks available."
-
-set -A args "add $TESTPOOL $ADD_DISK" "add -f $TESTPOOL $ADD_DISK"
+set -A args "add $TESTPOOL $DISK1" "add -f $TESTPOOL $DISK1"
log_assert "zpool add [-fn] pool_name vdev"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh Fri Sep 1 20:03:03 2017 (r323116)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/zpool_add_002_pos.ksh Fri Sep 1 20:12:18 2017 (r323117)
@@ -28,13 +28,9 @@
. $STF_SUITE/tests/cli_user/cli_user.kshlib
-ADD_DISK="${DISKS%% }"
-ADD_DISK="${ADD_DISK##* }"
+set_disks
-[[ -z $ADD_DISK ]] && \
- log_fail "No spare disks available."
-
-set -A args "add -n $TESTPOOL $ADD_DISK" "add -fn $TESTPOOL $ADD_DISK"
+set -A args "add -n $TESTPOOL $DISK1" "add -fn $TESTPOOL $DISK1"
log_assert "zpool add [-f] -n succeeds for unpriveleged users"
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh Fri Sep 1 20:03:03 2017 (r323116)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh Fri Sep 1 20:12:18 2017 (r323117)
@@ -38,6 +38,7 @@ zfs_list_001_pos_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_001_pos.ksh || atf_fail "Testcase failed"
}
@@ -65,6 +66,7 @@ zfs_list_002_pos_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_002_pos.ksh || atf_fail "Testcase failed"
}
@@ -92,6 +94,7 @@ zfs_list_003_pos_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_003_pos.ksh || atf_fail "Testcase failed"
}
@@ -119,6 +122,7 @@ zfs_list_004_neg_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_004_neg.ksh || atf_fail "Testcase failed"
}
@@ -146,6 +150,7 @@ zfs_list_005_pos_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
atf_expect_fail "https://www.illumos.org/issues/8599 Snapshots don't preserve user properties"
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_005_pos.ksh || atf_fail "Testcase failed"
@@ -174,6 +179,7 @@ zfs_list_006_pos_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_006_pos.ksh || atf_fail "Testcase failed"
}
@@ -201,6 +207,7 @@ zfs_list_007_pos_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_007_pos.ksh || atf_fail "Testcase failed"
}
@@ -228,6 +235,7 @@ zfs_list_008_neg_body()
. $(atf_get_srcdir)/zfs_list.kshlib
. $(atf_get_srcdir)/zfs_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zfs_list_008_neg.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh Fri Sep 1 20:03:03 2017 (r323116)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh Fri Sep 1 20:12:18 2017 (r323117)
@@ -37,6 +37,7 @@ zpool_iostat_001_neg_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_iostat.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_iostat_001_neg.ksh || atf_fail "Testcase failed"
}
@@ -62,6 +63,7 @@ zpool_iostat_002_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_iostat.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_iostat_002_pos.ksh || atf_fail "Testcase failed"
}
Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Fri Sep 1 20:03:03 2017 (r323116)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh Fri Sep 1 20:12:18 2017 (r323117)
@@ -39,6 +39,7 @@ zpool_list_001_pos_body()
. $(atf_get_srcdir)/../../../include/default.cfg
. $(atf_get_srcdir)/zpool_list.cfg
+ verify_disk_count "$DISKS" 1
ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
ksh93 $(atf_get_srcdir)/zpool_list_001_pos.ksh || atf_fail "Testcase failed"
}
More information about the svn-src-projects
mailing list