Date: Thu, 8 Feb 2018 22:09:46 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329046 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate: . zfs_allow Message-ID: <201802082209.w18M9kp8089389@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: asomers Date: Thu Feb 8 22:09:46 2018 New Revision: 329046 URL: https://svnweb.freebsd.org/changeset/base/329046 Log: Remove extraneous cleanup and setup steps from the zfs delegate tests Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh Thu Feb 8 22:06:46 2018 (r329045) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/cleanup.ksh Thu Feb 8 22:09:46 2018 (r329046) @@ -29,15 +29,7 @@ . $STF_SUITE/tests/delegate/delegate_common.kshlib -$ZFS 2>&1 | $GREP "allow" > /dev/null -(($? != 0)) && log_unsupported - cleanup_user_group -# restore the state of svc:/network/nis/client:default -if [[ -e $NISSTAFILE ]]; then - log_must $SVCADM enable svc:/network/nis/client:default - log_must $RM -f $NISSTAFILE -fi - default_cleanup +log_pass Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh Thu Feb 8 22:06:46 2018 (r329045) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/setup.ksh Thu Feb 8 22:09:46 2018 (r329046) @@ -29,18 +29,6 @@ . $STF_SUITE/tests/delegate/delegate_common.kshlib -$ZFS 2>&1 | $GREP "allow" > /dev/null -(($? != 0)) && log_unsupported - -# check svc:/network/nis/client:default state -# disable it if the state is ON -# and the state will be restored during cleanup.ksh -log_must $RM -f $NISSTAFILE -if [[ "ON" == $($SVCS -H -o sta svc:/network/nis/client:default) ]]; then - log_must $SVCADM disable -t svc:/network/nis/client:default - log_must $TOUCH $NISSTAFILE -fi - cleanup_user_group # Create staff group and add two user to it Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh Thu Feb 8 22:06:46 2018 (r329045) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate/zfs_allow/cleanup.ksh Thu Feb 8 22:09:46 2018 (r329046) @@ -29,12 +29,4 @@ . $STF_SUITE/tests/delegate/delegate_common.kshlib -$ZFS 2>&1 | $GREP "allow" > /dev/null -(($? != 0)) && log_unsupported - -if is_global_zone ; then - log_must $ZPOOL set delegation=on $TESTPOOL -fi -log_must restore_root_datasets - log_pass
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802082209.w18M9kp8089389>