Date: Thu, 8 Feb 2018 21:14:28 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329034 - projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug Message-ID: <201802082114.w18LESqR062980@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Thu Feb 8 21:14:28 2018 New Revision: 329034 URL: https://svnweb.freebsd.org/changeset/base/329034 Log: Delete redundant hotplug tests hotplug_004_pos was redundant with zpool_replace_002_neg. The others were redundant with various zfsd tests. Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_002_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_004_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_005_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_006_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_009_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_010_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 8 21:11:48 2018 (r329033) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/Makefile Thu Feb 8 21:14:28 2018 (r329034) @@ -8,19 +8,12 @@ FILESDIR=${TESTSDIR} ATF_TESTS_KSH93+= hotplug_test -${PACKAGE}FILES+= hotplug.cfg -${PACKAGE}FILES+= hotplug_006_pos.ksh -${PACKAGE}FILES+= hotplug_002_pos.ksh ${PACKAGE}FILES+= cleanup.ksh -${PACKAGE}FILES+= hotplug_003_pos.ksh -${PACKAGE}FILES+= setup.ksh -${PACKAGE}FILES+= hotplug_005_pos.ksh -${PACKAGE}FILES+= hotplug_001_pos.ksh -${PACKAGE}FILES+= hotplug_009_pos.ksh -${PACKAGE}FILES+= hotplug_010_pos.ksh +${PACKAGE}FILES+= hotplug.cfg ${PACKAGE}FILES+= hotplug.kshlib -${PACKAGE}FILES+= hotplug_011_pos.ksh +${PACKAGE}FILES+= hotplug_001_pos.ksh ${PACKAGE}FILES+= hotplug_008_pos.ksh -${PACKAGE}FILES+= hotplug_004_pos.ksh +${PACKAGE}FILES+= hotplug_011_pos.ksh +${PACKAGE}FILES+= setup.ksh .include <bsd.test.mk> Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Thu Feb 8 21:11:48 2018 (r329033) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh Thu Feb 8 21:14:28 2018 (r329034) @@ -49,142 +49,6 @@ hotplug_001_pos_cleanup() ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } - -atf_test_case hotplug_002_pos cleanup -hotplug_002_pos_head() -{ - atf_set "descr" "When removing and reinserting a device, the device status is ONLINE." - atf_set "require.progs" zpool gnop -} -hotplug_002_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "redundant with zfsd_replace_001_pos" - verify_disk_count "$DISKS" 4 - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_002_pos.ksh || atf_fail "Testcase failed" -} -hotplug_002_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case hotplug_003_pos cleanup -hotplug_003_pos_head() -{ - atf_set "descr" "Having removed a device from a redundant pool and inserted a newdevice, the new device state will be 'ONLINE' when autoreplace is on,\and 'UNAVAIL' when autoreplace is off" - atf_set "require.progs" zpool lofiadm - atf_set "timeout" 1800 -} -hotplug_003_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "redundant with zfsd_autoreplace_00[12]*" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_003_pos.ksh || atf_fail "Testcase failed" -} -hotplug_003_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case hotplug_004_pos cleanup -hotplug_004_pos_head() -{ - atf_set "descr" "When device replacement fails, the original device's state willbe 'UNAVAIL' and an FMA fault will be generated." - atf_set "require.progs" zpool lofiadm - atf_set "timeout" 1800 -} -hotplug_004_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "Does not apply to FreeBSD" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_004_pos.ksh || atf_fail "Testcase failed" -} -hotplug_004_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case hotplug_005_pos cleanup -hotplug_005_pos_head() -{ - atf_set "descr" "Regarding of autoreplace, when removing offline device andreinserting again. This device's status is 'ONLINE'. \No FMA fault was generated." - atf_set "require.progs" zpool lofiadm - atf_set "timeout" 1800 -} -hotplug_005_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "TODO: move to the zfsd directory" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_005_pos.ksh || atf_fail "Testcase failed" -} -hotplug_005_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case hotplug_006_pos cleanup -hotplug_006_pos_head() -{ - atf_set "descr" "When unsetting/setting autoreplace, then replacing device, verifythe device's status is 'UNAVAIL/ONLINE'. No FMA fault is generated." - atf_set "require.progs" zpool lofiadm - atf_set "timeout" 1800 -} -hotplug_006_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "redundant with hotplug_050_pos" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_006_pos.ksh || atf_fail "Testcase failed" -} -hotplug_006_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - atf_test_case hotplug_008_pos cleanup hotplug_008_pos_head() { @@ -210,61 +74,6 @@ hotplug_008_pos_cleanup() ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" } - -atf_test_case hotplug_009_pos cleanup -hotplug_009_pos_head() -{ - atf_set "descr" "Power off machine and replacing device, verify device status isONLINE when autoreplace is on and UNAVAIL when autoreplace is off" - atf_set "require.progs" zpool lofiadm svcadm svcs - atf_set "timeout" 1800 -} -hotplug_009_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "redundant with zfsd_import_001_pos" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_009_pos.ksh || atf_fail "Testcase failed" -} -hotplug_009_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - -atf_test_case hotplug_010_pos cleanup -hotplug_010_pos_head() -{ - atf_set "descr" "Removing device offlined and reinserting onlined,verify the device status ONLINE." - atf_set "require.progs" zpool lofiadm svcadm svcs - atf_set "timeout" 1800 -} -hotplug_010_pos_body() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - atf_skip "redundant with zfsd_replace_001_pos" - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/hotplug_010_pos.ksh || atf_fail "Testcase failed" -} -hotplug_010_pos_cleanup() -{ - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/hotplug.kshlib - . $(atf_get_srcdir)/hotplug.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - atf_test_case hotplug_011_pos cleanup hotplug_011_pos_head() { @@ -295,13 +104,6 @@ atf_init_test_cases() { atf_add_test_case hotplug_001_pos - atf_add_test_case hotplug_002_pos - atf_add_test_case hotplug_003_pos - atf_add_test_case hotplug_004_pos - atf_add_test_case hotplug_005_pos - atf_add_test_case hotplug_006_pos atf_add_test_case hotplug_008_pos - atf_add_test_case hotplug_009_pos - atf_add_test_case hotplug_010_pos atf_add_test_case hotplug_011_pos }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802082114.w18LESqR062980>