Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>

*** 24,34 **** # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013, 2015 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/cachefile/cachefile.cfg . $STF_SUITE/tests/functional/cachefile/cachefile.kshlib --- 24,34 ---- # Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # ! # Copyright (c) 2013, 2016 by Delphix. All rights reserved. # . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/cachefile/cachefile.cfg . $STF_SUITE/tests/functional/cachefile/cachefile.kshlib
*** 57,67 **** mntpnt=$(get_prop mountpoint $TESTPOOL) typeset -i i=0 while ((i < 2)); do if [[ -e $mntpnt/vdev$i ]]; then ! log_must $RM -f $mntpnt/vdev$i fi ((i += 1)) done if poolexists $TESTPOOL ; then --- 57,67 ---- mntpnt=$(get_prop mountpoint $TESTPOOL) typeset -i i=0 while ((i < 2)); do if [[ -e $mntpnt/vdev$i ]]; then ! log_must rm -f $mntpnt/vdev$i fi ((i += 1)) done if poolexists $TESTPOOL ; then
*** 68,124 **** destroy_pool $TESTPOOL fi for file in $CPATH1 $CPATH2 ; do if [[ -f $file ]] ; then ! log_must $RM $file fi done } log_assert "Verify set, export and destroy when cachefile is set on pool." log_onexit cleanup ! log_must $ZPOOL create $TESTPOOL $DISKS mntpnt=$(get_prop mountpoint $TESTPOOL) typeset -i i=0 while ((i < 2)); do ! log_must $MKFILE $MINVDEVSIZE $mntpnt/vdev$i eval vdev$i=$mntpnt/vdev$i ((i += 1)) done ! log_must $ZPOOL create -o cachefile=$CPATH1 $TESTPOOL1 $vdev0 log_must pool_in_cache $TESTPOOL1 $CPATH1 ! log_must $ZPOOL create -o cachefile=$CPATH1 $TESTPOOL2 $vdev1 log_must pool_in_cache $TESTPOOL2 $CPATH1 ! log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL1 log_must pool_in_cache $TESTPOOL1 $CPATH2 ! log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL2 log_must pool_in_cache $TESTPOOL2 $CPATH2 if [[ -f $CPATH1 ]]; then log_fail "Verify set when cachefile is set on pool." fi ! log_must $ZPOOL export $TESTPOOL1 ! log_must $ZPOOL export $TESTPOOL2 if [[ -f $CPATH2 ]]; then log_fail "Verify export when cachefile is set on pool." fi ! log_must $ZPOOL import -d $mntpnt $TESTPOOL1 ! log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL1 log_must pool_in_cache $TESTPOOL1 $CPATH2 ! log_must $ZPOOL import -d $mntpnt $TESTPOOL2 ! log_must $ZPOOL set cachefile=$CPATH2 $TESTPOOL2 log_must pool_in_cache $TESTPOOL2 $CPATH2 ! log_must $ZPOOL destroy $TESTPOOL1 ! log_must $ZPOOL destroy $TESTPOOL2 if [[ -f $CPATH2 ]]; then log_fail "Verify destroy when cachefile is set on pool." fi log_pass "Verify set, export and destroy when cachefile is set on pool." --- 68,124 ---- destroy_pool $TESTPOOL fi for file in $CPATH1 $CPATH2 ; do if [[ -f $file ]] ; then ! log_must rm $file fi done } log_assert "Verify set, export and destroy when cachefile is set on pool." log_onexit cleanup ! log_must zpool create $TESTPOOL $DISKS mntpnt=$(get_prop mountpoint $TESTPOOL) typeset -i i=0 while ((i < 2)); do ! log_must mkfile $MINVDEVSIZE $mntpnt/vdev$i eval vdev$i=$mntpnt/vdev$i ((i += 1)) done ! log_must zpool create -o cachefile=$CPATH1 $TESTPOOL1 $vdev0 log_must pool_in_cache $TESTPOOL1 $CPATH1 ! log_must zpool create -o cachefile=$CPATH1 $TESTPOOL2 $vdev1 log_must pool_in_cache $TESTPOOL2 $CPATH1 ! log_must zpool set cachefile=$CPATH2 $TESTPOOL1 log_must pool_in_cache $TESTPOOL1 $CPATH2 ! log_must zpool set cachefile=$CPATH2 $TESTPOOL2 log_must pool_in_cache $TESTPOOL2 $CPATH2 if [[ -f $CPATH1 ]]; then log_fail "Verify set when cachefile is set on pool." fi ! log_must zpool export $TESTPOOL1 ! log_must zpool export $TESTPOOL2 if [[ -f $CPATH2 ]]; then log_fail "Verify export when cachefile is set on pool." fi ! log_must zpool import -d $mntpnt $TESTPOOL1 ! log_must zpool set cachefile=$CPATH2 $TESTPOOL1 log_must pool_in_cache $TESTPOOL1 $CPATH2 ! log_must zpool import -d $mntpnt $TESTPOOL2 ! log_must zpool set cachefile=$CPATH2 $TESTPOOL2 log_must pool_in_cache $TESTPOOL2 $CPATH2 ! log_must zpool destroy $TESTPOOL1 ! log_must zpool destroy $TESTPOOL2 if [[ -f $CPATH2 ]]; then log_fail "Verify destroy when cachefile is set on pool." fi log_pass "Verify set, export and destroy when cachefile is set on pool."