From owner-svn-src-projects@freebsd.org Wed Dec 16 20:45:30 2015 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6CE92A495B2 for ; Wed, 16 Dec 2015 20:45:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4366C1500; Wed, 16 Dec 2015 20:45:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBGKjTaY069354; Wed, 16 Dec 2015 20:45:29 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGKjT6I069351; Wed, 16 Dec 2015 20:45:29 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512162045.tBGKjT6I069351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 20:45:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292362 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/compression X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2015 20:45:30 -0000 Author: asomers Date: Wed Dec 16 20:45:28 2015 New Revision: 292362 URL: https://svnweb.freebsd.org/changeset/base/292362 Log: Misc ZFS test suite fixes tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh Improve debuggability of this test by dumping pool status appropriately. tests/sys/cddl/zfs/tests/compression/compress_002_pos.ksh tests/sys/cddl/zfs/tests/compression/compression_test.sh Delete the compress_002_pos testcase. tests/sys/cddl/zfs/include/libtest.kshlib create_vdevs(): Remove OBE variable $vdev, which had no effect. Noticed by Alan. Submitted by: Will Sponsored by: Spectra Logic Corp Deleted: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compress_002_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Dec 16 20:34:32 2015 (r292361) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Wed Dec 16 20:45:28 2015 (r292362) @@ -1156,7 +1156,7 @@ function create_vdevs # vdevs [ -n "$VDEV_SIZE" ] && vdsize=$VDEV_SIZE rm -f $@ || return 1 - truncate -s $vdsize $vdev $@ + truncate -s $vdsize $@ } # 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 Dec 16 20:34:32 2015 (r292361) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cache/cache_009_pos.ksh Wed Dec 16 20:45:28 2015 (r292362) @@ -69,11 +69,15 @@ do log_must $ZPOOL offline $TESTPOOL $ldev log_must display_status $TESTPOOL log_must verify_cache_device $TESTPOOL $ldev 'OFFLINE' '' + log_note "Offline pool configuration, for reference:" + log_must $ZPOOL status -v $TESTPOOL log_must $ZPOOL online $TESTPOOL $ldev log_must display_status $TESTPOOL log_must verify_cache_device $TESTPOOL $ldev 'ONLINE' '' + log_note "Final pool configuration, for reference:" + log_must $ZPOOL status -v $TESTPOOL log_must $ZPOOL destroy -f $TESTPOOL done Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh Wed Dec 16 20:34:32 2015 (r292361) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/compression/compression_test.sh Wed Dec 16 20:45:28 2015 (r292362) @@ -50,32 +50,6 @@ compress_001_pos_cleanup() } -atf_test_case compress_002_pos cleanup -compress_002_pos_head() -{ - atf_set "descr" "Ensure that compressed files in a dataset are smaller." - atf_set "require.config" rt_long - atf_set "require.progs" zfs -} -compress_002_pos_body() -{ - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/compress.cfg - - ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" - ksh93 $(atf_get_srcdir)/compress_002_pos.ksh || atf_fail "Testcase failed" -} -compress_002_pos_cleanup() -{ - export TESTCASE_ID=$(echo $(atf_get ident) | cksum -o 2 | cut -f 1 -d " ") - . $(atf_get_srcdir)/../../include/default.cfg - . $(atf_get_srcdir)/compress.cfg - - ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed" -} - - atf_test_case compress_003_pos cleanup compress_003_pos_head() { @@ -135,7 +109,6 @@ atf_init_test_cases() { atf_add_test_case compress_001_pos - atf_add_test_case compress_002_pos atf_add_test_case compress_003_pos atf_add_test_case compress_004_pos }