From owner-svn-src-projects@freebsd.org Tue Feb 13 17:44:55 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 618ABF14BF1 for ; Tue, 13 Feb 2018 17:44:55 +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 1410C8662B; Tue, 13 Feb 2018 17:44:55 +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 0F0E82403F; Tue, 13 Feb 2018 17:44:55 +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 w1DHisUW002236; Tue, 13 Feb 2018 17:44:54 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHisnH002235; Tue, 13 Feb 2018 17:44:54 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131744.w1DHisnH002235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 13 Feb 2018 17:44:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329229 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename X-SVN-Commit-Revision: 329229 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: Tue, 13 Feb 2018 17:44:55 -0000 Author: asomers Date: Tue Feb 13 17:44:54 2018 New Revision: 329229 URL: https://svnweb.freebsd.org/changeset/base/329229 Log: Remove the cleanup step in zfs_rename_009_neg tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Remove the cleanup step. It's redundant with the standard cleanup in cleanup.ksh. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Tue Feb 13 17:43:54 2018 (r329228) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_009_neg.ksh Tue Feb 13 17:44:54 2018 (r329229) @@ -63,32 +63,7 @@ if (($? != 0)); then log_unsupported fi -function cleanup -{ - typeset snaps=$($ZFS list -H -t snapshot -o name) - typeset exclude - typeset snap - typeset pool_name - - if [[ -n $KEEP ]]; then - exclude=`eval $ECHO \"'(${KEEP})'\"` - fi - - for snap in $snaps; do - pool_name=$($ECHO "$snap" | $AWK -F/ '{print $1}') - if [[ -n $exclude ]]; then - $ECHO "$pool_name" | $EGREP -v "$exclude" > /dev/null 2>&1 - if [[ $? -eq 0 ]]; then - log_must $ZFS destroy $snap - fi - else - log_must $ZFS destroy $snap - fi - done -} - log_assert "zfs rename -r failed, when snapshot name is already existing." -log_onexit cleanup set -A datasets $TESTPOOL $TESTPOOL/$TESTCTR \ $TESTPOOL/$TESTCTR/$TESTFS1 $TESTPOOL/$TESTFS