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 by Delphix. All rights reserved. # . $STF_SUITE/tests/functional/cache/cache.cfg . $STF_SUITE/tests/functional/cache/cache.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/tests/functional/cache/cache.cfg . $STF_SUITE/tests/functional/cache/cache.kshlib
*** 45,68 **** verify_runnable "global" verify_disk_count "$LDEV2" function cleanup { if datasetexists $TESTPOOL ; then ! log_must $ZPOOL destroy -f $TESTPOOL fi } log_assert "Remove cache device from pool with spare device should succeed" log_onexit cleanup for type in "" "mirror" "raidz" "raidz2" do ! log_must $ZPOOL create $TESTPOOL $type $VDEV \ cache $LDEV spare $LDEV2 ! log_must $ZPOOL remove $TESTPOOL $LDEV log_must display_status $TESTPOOL ! log_must $ZPOOL destroy -f $TESTPOOL done log_pass "Remove cache device from pool with spare device should succeed" --- 45,68 ---- verify_runnable "global" verify_disk_count "$LDEV2" function cleanup { if datasetexists $TESTPOOL ; then ! log_must zpool destroy -f $TESTPOOL fi } log_assert "Remove cache device from pool with spare device should succeed" log_onexit cleanup for type in "" "mirror" "raidz" "raidz2" do ! log_must zpool create $TESTPOOL $type $VDEV \ cache $LDEV spare $LDEV2 ! log_must zpool remove $TESTPOOL $LDEV log_must display_status $TESTPOOL ! log_must zpool destroy -f $TESTPOOL done log_pass "Remove cache device from pool with spare device should succeed"