From owner-svn-src-head@freebsd.org Mon Aug 21 20:23:07 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BEA4DCF45E; Mon, 21 Aug 2017 20:23:07 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id EDDFF8345C; Mon, 21 Aug 2017 20:23:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7LKN6hf093358; Mon, 21 Aug 2017 20:23:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7LKN654093357; Mon, 21 Aug 2017 20:23:06 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201708212023.v7LKN654093357@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 21 Aug 2017 20:23:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r322770 - head/usr.sbin/chown/tests X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/usr.sbin/chown/tests X-SVN-Commit-Revision: 322770 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Aug 2017 20:23:07 -0000 Author: gjb Date: Mon Aug 21 20:23:05 2017 New Revision: 322770 URL: https://svnweb.freebsd.org/changeset/base/322770 Log: Apply changes from bin/chmod/tests/chmod_test.sh (r321949, r321950, and r322101), adding atf_expect_fail() before chflags(8) is invoked if the filesystem is ZFS, which does not support UF_IMMUTABLE. MFC after: 3 days Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/chown/tests/chown_test.sh Modified: head/usr.sbin/chown/tests/chown_test.sh ============================================================================== --- head/usr.sbin/chown/tests/chown_test.sh Mon Aug 21 18:12:32 2017 (r322769) +++ head/usr.sbin/chown/tests/chown_test.sh Mon Aug 21 20:23:05 2017 (r322770) @@ -25,6 +25,13 @@ # # $FreeBSD$ +get_filesystem() +{ + local mountpoint=$1 + + df -T $mountpoint | tail -n 1 | cut -wf 2 +} + atf_test_case RH_flag RH_flag_head() { @@ -98,6 +105,11 @@ f_flag_body() { atf_check truncate -s 0 foo bar atf_check chown 0:0 foo bar + case "$(get_filesystem .)" in + zfs) + atf_expect_fail "ZFS does not support UF_IMMUTABLE; returns EPERM" + ;; + esac atf_check chflags uchg foo atf_check -e not-empty -s not-exit:0 chown 42:42 foo bar atf_check -o inline:'0:0\n42:42\n' stat -f '%u:%g' foo bar @@ -107,7 +119,7 @@ f_flag_body() f_flag_cleanup() { - atf_check chflags 0 foo + chflags 0 foo || : } atf_test_case h_flag @@ -144,6 +156,11 @@ v_flag_body() atf_check truncate -s 0 foo bar atf_check chown 0:0 foo atf_check chown 42:42 bar + case "$(get_filesystem .)" in + zfs) + atf_expect_fail "ZFS updates mode for foo unnecessarily" + ;; + esac atf_check -o 'inline:bar\n' chown -v 0:0 foo bar atf_check chown -v 0:0 foo bar for f in foo bar; do