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 2008 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
! # Copyright (c) 2013 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/refreserv/refreserv.cfg
--- 24,34 ----
# Copyright 2008 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/refreserv/refreserv.cfg
*** 45,75 ****
verify_runnable "both"
function cleanup
{
! log_must $ZFS destroy -rf $TESTPOOL/$TESTFS
! log_must $ZFS create $TESTPOOL/$TESTFS
! log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
}
log_assert "Reservations are enforced using the maximum of " \
"'reserv' and 'refreserv'"
log_onexit cleanup
fs=$TESTPOOL/$TESTFS ; subfs=$fs/subfs
! log_must $ZFS create $subfs
! log_must $ZFS set quota=25M $fs
! log_must $ZFS set reserv=10M $subfs
! log_must $ZFS set refreserv=20M $subfs
mntpnt=$(get_prop mountpoint $fs)
! log_mustnot $MKFILE 15M $mntpnt/$TESTFILE
! log_must $RM -f $mntpnt/$TESTFILE
! log_must $ZFS set reserv=20M $subfs
! log_must $ZFS set refreserv=10M $subfs
! log_mustnot $MKFILE 15M $mntpnt/$TESTFILE
log_pass "Reservations are enforced using the maximum of " \
"'reserv' and 'refreserv'"
--- 45,75 ----
verify_runnable "both"
function cleanup
{
! log_must zfs destroy -rf $TESTPOOL/$TESTFS
! log_must zfs create $TESTPOOL/$TESTFS
! log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS
}
log_assert "Reservations are enforced using the maximum of " \
"'reserv' and 'refreserv'"
log_onexit cleanup
fs=$TESTPOOL/$TESTFS ; subfs=$fs/subfs
! log_must zfs create $subfs
! log_must zfs set quota=25M $fs
! log_must zfs set reserv=10M $subfs
! log_must zfs set refreserv=20M $subfs
mntpnt=$(get_prop mountpoint $fs)
! log_mustnot mkfile 15M $mntpnt/$TESTFILE
! log_must rm -f $mntpnt/$TESTFILE
! log_must zfs set reserv=20M $subfs
! log_must zfs set refreserv=10M $subfs
! log_mustnot mkfile 15M $mntpnt/$TESTFILE
log_pass "Reservations are enforced using the maximum of " \
"'reserv' and 'refreserv'"