svn commit: r292362 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/cache tests/compression

[Alan Somers]

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
 }