From owner-svn-src-projects@freebsd.org Tue Feb 13 17:42:22 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 E28F0F14847 for ; Tue, 13 Feb 2018 17:42:21 +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 3B1D08629E; Tue, 13 Feb 2018 17:42:21 +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 3505724029; Tue, 13 Feb 2018 17:42:21 +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 w1DHgLXc002045; Tue, 13 Feb 2018 17:42:21 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1DHgGLF001998; Tue, 13 Feb 2018 17:42:16 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802131742.w1DHgGLF001998@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:42:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329227 - projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance X-SVN-Commit-Revision: 329227 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:42:22 -0000 Author: asomers Date: Tue Feb 13 17:42:16 2018 New Revision: 329227 URL: https://svnweb.freebsd.org/changeset/base/329227 Log: In inheritance/inherit_001_pos, don't create a pool named TESTPOOL Every other test creates a pool named testpool.XXXX, where XXXX is a decimal hash. For technical reasons, it's hard to do the same for this test. But "testpool.inherit" is more conventional than TESTPOOL. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config001.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config001.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config002.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config002.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config003.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config003.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config004.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config004.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config005.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config005.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config006.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config006.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config007.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config007.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config008.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config008.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS default +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config009.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config009.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS default +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config010.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config010.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS default +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config011.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config011.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config012.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config012.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR default -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR default +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config013.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config013.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config014.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config014.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config015.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config015.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config016.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config016.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL default -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL default +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config017.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config017.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config018.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config018.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config019.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config019.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config020.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config020.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS - +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS - Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config021.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config021.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config022.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config022.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR - -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR - +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config023.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config023.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/config024.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -26,6 +26,6 @@ # # ident "@(#)config024.cfg 1.2 07/01/09 SMI" # -TESTPOOL POOL local -TESTPOOL/TESTCTR CTR local -TESTPOOL/TESTCTR/TESTFS1 FS local +testpool.inherit POOL local +testpool.inherit/TESTCTR CTR local +testpool.inherit/TESTCTR/TESTFS1 FS local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state001.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -38,5 +38,5 @@ -:- # local local -TESTPOOL TESTPOOL -TESTPOOL TESTPOOL +testpool.inherit testpool.inherit +testpool.inherit testpool.inherit Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state002.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,4 +40,4 @@ # default default local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state005.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,4 +40,4 @@ # local local local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state006.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -41,5 +41,5 @@ # # local local -TESTPOOL TESTPOOL +testpool.inherit testpool.inherit local local Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state009.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -35,19 +35,19 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # default default default default default default # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state010.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -34,19 +34,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default default default default default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state011.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -36,19 +36,19 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # default default default default local local # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default local local # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state012.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,19 +40,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default default default local default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state013.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -34,19 +34,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit +testpool.inherit:inherit # default default local local local local # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default local local # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state014.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,19 +40,19 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default local default local default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state015.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -43,21 +43,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # default default local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default -TESTPOOL/TESTCTR default +testpool.inherit/TESTCTR default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state016.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,19 +40,19 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # default default local default -TESTPOOL default +testpool.inherit default # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state017.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -44,21 +44,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # local default local local -TESTPOOL/TESTCTR TESTPOOL/TESTCTR +testpool.inherit/TESTCTR testpool.inherit/TESTCTR # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default -TESTPOOL/TESTCTR default +testpool.inherit/TESTCTR default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state018.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -41,21 +41,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default local default -TESTPOOL/TESTCTR default +testpool.inherit/TESTCTR default # # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state019.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -39,21 +39,21 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit +testpool.inherit:inherit # local default -TESTPOOL default -TESTPOOL default +testpool.inherit default +testpool.inherit default # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state020.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,21 +40,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default -TESTPOOL default -TESTPOOL default +testpool.inherit default +testpool.inherit default # # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state021.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -40,21 +40,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # local default -TESTPOOL default +testpool.inherit default local local # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default local local # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state022.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -39,21 +39,21 @@ # # *** ASSERTION DESCRIPTION *** # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default -TESTPOOL default +testpool.inherit default local default # # -TESTPOOL/TESTCTR:inherit -r +testpool.inherit/TESTCTR:inherit -r # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit -r +testpool.inherit/TESTCTR/TESTFS1:inherit -r # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state023.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -41,21 +41,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit +testpool.inherit:inherit # local default local local local local # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default local default local local # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg Tue Feb 13 17:42:10 2018 (r329226) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/inheritance/state024.cfg Tue Feb 13 17:42:16 2018 (r329227) @@ -39,21 +39,21 @@ # *** ASSERTION DESCRIPTION *** # # -TESTPOOL:inherit -r +testpool.inherit:inherit -r # local default local default local default # # -TESTPOOL/TESTCTR:inherit +testpool.inherit/TESTCTR:inherit # default default default default default default # # -TESTPOOL/TESTCTR/TESTFS1:inherit +testpool.inherit/TESTCTR/TESTFS1:inherit # default default default default