From owner-svn-src-projects@freebsd.org Thu Feb 8 22:09:47 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47578F09625 for ; Thu, 8 Feb 2018 22:09:47 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F11B5813D7; Thu, 8 Feb 2018 22:09:46 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EC07A1C002; Thu, 8 Feb 2018 22:09:46 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w18M9kTJ089392; Thu, 8 Feb 2018 22:09:46 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w18M9kp8089389; Thu, 8 Feb 2018 22:09:46 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802082209.w18M9kp8089389@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 8 Feb 2018 22:09:46 +0000 (UTC) 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 X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/delegate: . zfs_allow X-SVN-Commit-Revision: 329046 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 22:09:47 -0000 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