From owner-svn-src-projects@freebsd.org Wed Dec 16 19:14:38 2015 Return-Path: Delivered-To: svn-src-projects@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 E36BCA48BA3 for ; Wed, 16 Dec 2015 19:14:38 +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 mx1.freebsd.org (Postfix) with ESMTPS id B384C14DD; Wed, 16 Dec 2015 19:14:38 +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 tBGJEbmK042115; Wed, 16 Dec 2015 19:14:37 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGJEb6S042114; Wed, 16 Dec 2015 19:14:37 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201512161914.tBGJEb6S042114@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 16 Dec 2015 19:14:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292349 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set X-SVN-Group: projects 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.20 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: Wed, 16 Dec 2015 19:14:39 -0000 Author: asomers Date: Wed Dec 16 19:14:37 2015 New Revision: 292349 URL: https://svnweb.freebsd.org/changeset/base/292349 Log: Reinstate the "gzip-6" to "gzip" expected value translation. This is required by compression_001_pos, which sets and checks property values for the compression property. This particular value gets translated internally because gzip-6 is the default for "gzip". Submitted by: Will Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Wed Dec 16 19:01:14 2015 (r292348) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_common.kshlib Wed Dec 16 19:14:37 2015 (r292349) @@ -64,6 +64,7 @@ function set_n_check_prop err="ERROR: Dataset '$dataset': '$prop' value '$cur_value'" if [ "$expect_result" = "true" ]; then + [ "$expect_value" = "gzip-6" ] && expect_value="gzip" case "$prop" in reservation|reserv|quota) if [ "$expect_value" = "none" -a "$cur_value" != "0" ]; then