Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh	(revision 329285)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_018_pos.ksh	(revision 329286)
@@ -1,93 +1,93 @@
 #! /usr/local/bin/ksh93 -p
 #
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 #
 . $STF_SUITE/include/libtest.kshlib
 
 ################################################################################
 #
 # __stc_assertion_start
 #
 # ID: snapshot_018_pos
 #
 # DESCRIPTION:
 #	Snapshot directory supports ACL operations
 #
 # STRATEGY:
 #	1. Create a dataset
 #	2. Set the snapdir property to visible
 #	3. Use getconf to verify that acls are supported
 #	4. Use getfacl to verify that the acl can be read
 #	5. Verify that the acl is correct
 #	6. Verify that ls doesn't print any errors because acl_get_link fails
 #
 # TESTABILITY: explicit
 #
 # TEST_AUTOMATION_LEVEL: automated
 #
 # CODING_STATUS: COMPLETED (2013-01-03)
 #
 # __stc_assertion_end
 #
 ################################################################################
 
 verify_runnable "both"
 
 log_assert "Verify that the snapshot directory supports ACL operations"
 
 log_must dataset_setprop $TESTPOOL/$TESTFS "snapdir" "visible"
 
 function verify_dir # directory
 {
 	typeset DIR=$1
 	# 3. Verify that ACLs are supported by the ctldir
 	log_must $GETCONF TRUSTEDBSD_ACL_EXTENDED $DIR
 	# 4. Verify that we can read ACLs
 	log_must $GETFACL $DIR
 	# 5. Verify that the ACLs are correct
 	typeset PROG_DIR=$STF_SUITE/tests/snapshot
 	typeset SUM=$($SHA1 -q $PROG_DIR/ctldir_acl.txt)
 	if [[ $( $GETFACL -q $DIR | $SHA1 -q ) != $SUM ]]; then
 		log_fail "ACL is incorrect"
 	fi
 
 }
 
 typeset -a dirlist
-dirlist=( "$TESTDIR/.zfs" "$TESTDIR/.zfs/snapshot" "$TESTDIR/.zfs/shares" ) 
+dirlist=( "$TESTDIR/.zfs" "$TESTDIR/.zfs/snapshot" ) 
 ctldir=".zfs"
 for d in ${dirlist[@]}; do
 	verify_dir $d
 done
 
 # 6. Check for errors with ls
 LS_STDERR=$( $LS -la $TESTDIR/$ctldir 2>&1 > /dev/null)
 LS_R_STDERR=$( $LS -lar $TESTDIR/$ctldir 2>&1 > /dev/null)
 if [[ -n $LS_STDERR || -n $LS_R_STDERR ]]; then
 	log_fail "ls encountered errors"
 fi
 
 log_pass
Index: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh
===================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh	(revision 329285)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh	(revision 329286)
@@ -1,610 +1,609 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
 # Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
 # See the License for the specific language governing permissions
 # and limitations under the License.
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
 # If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 
 #
 # Copyright 2012 Spectra Logic.  All rights reserved.
 # Use is subject to license terms.
 #
 
 
 atf_test_case clone_001_pos cleanup
 clone_001_pos_head()
 {
 	atf_set "descr" "Verify a cloned file system is writable."
 	atf_set "require.progs"  zfs
 }
 clone_001_pos_body()
 {
 	atf_expect_fail "Creating a pool on a zvol is not yet supported in FreeBSD"
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/clone_001_pos.ksh || atf_fail "Testcase failed"
 }
 clone_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case rollback_001_pos cleanup
 rollback_001_pos_head()
 {
 	atf_set "descr" "Verify that a rollback to a previous snapshot succeeds."
 	atf_set "require.progs"  zfs
 }
 rollback_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/rollback_001_pos.ksh || atf_fail "Testcase failed"
 }
 rollback_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case rollback_002_pos cleanup
 rollback_002_pos_head()
 {
 	atf_set "descr" "Verify rollback is with respect to latest snapshot."
 	atf_set "require.progs"  zfs
 }
 rollback_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/rollback_002_pos.ksh || atf_fail "Testcase failed"
 }
 rollback_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case rollback_003_pos cleanup
 rollback_003_pos_head()
 {
 	atf_set "descr" "Verify rollback succeeds when there are nested file systems."
 	atf_set "require.progs"  zfs
 }
 rollback_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/rollback_003_pos.ksh || atf_fail "Testcase failed"
 }
 rollback_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_001_pos cleanup
 snapshot_001_pos_head()
 {
 	atf_set "descr" "Verify a file system snapshot is identical to original."
 	atf_set "require.progs"  zfs sum
 }
 snapshot_001_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_001_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_001_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_002_pos cleanup
 snapshot_002_pos_head()
 {
 	atf_set "descr" "Verify an archive of a file system is identical toan archive of its snapshot."
 	atf_set "require.progs"  zfs
 }
 snapshot_002_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_002_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_002_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_003_pos cleanup
 snapshot_003_pos_head()
 {
 	atf_set "descr" "Verify many snapshots of a file system can be taken."
 	atf_set "require.progs"  zfs
 }
 snapshot_003_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_003_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_003_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_004_pos cleanup
 snapshot_004_pos_head()
 {
 	atf_set "descr" "Verify that a snapshot of an empty file system remains empty."
 	atf_set "require.progs"  zfs
 }
 snapshot_004_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_004_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_004_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_005_pos cleanup
 snapshot_005_pos_head()
 {
 	atf_set "descr" "Verify that a snapshot of a dataset is identical tothe original dataset."
 	atf_set "require.progs"  zfs sum
 }
 snapshot_005_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_005_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_005_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_006_pos cleanup
 snapshot_006_pos_head()
 {
 	atf_set "descr" "Verify that an archive of a dataset is identical toan archive of the dataset's snapshot."
 	atf_set "require.progs"  zfs
 }
 snapshot_006_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_006_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_006_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_007_pos cleanup
 snapshot_007_pos_head()
 {
 	atf_set "descr" "Verify that many snapshots can be made on a zfs dataset."
 	atf_set "require.progs"  zfs
 }
 snapshot_007_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_007_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_007_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_008_pos cleanup
 snapshot_008_pos_head()
 {
 	atf_set "descr" "Verify that destroying snapshots returns space to the pool."
 	atf_set "require.progs"  zfs
 }
 snapshot_008_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_008_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_008_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_009_pos cleanup
 snapshot_009_pos_head()
 {
 	atf_set "descr" "Verify snapshot -r can correctly create a snapshot tree."
 	atf_set "require.progs"  zfs
 }
 snapshot_009_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_009_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_009_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_010_pos cleanup
 snapshot_010_pos_head()
 {
 	atf_set "descr" "Verify 'destroy -r' can correctly destroy a snapshot subtree at any point."
 	atf_set "require.progs"  zfs
 }
 snapshot_010_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_010_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_010_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_011_pos cleanup
 snapshot_011_pos_head()
 {
 	atf_set "descr" "Verify that rollback to a snapshot created by snapshot -r succeeds."
 	atf_set "require.progs"  zfs
 }
 snapshot_011_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_011_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_011_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_012_pos cleanup
 snapshot_012_pos_head()
 {
 	atf_set "descr" "Verify that 'snapshot -r' can work with 'zfs promote'."
 	atf_set "require.progs"  zfs
 }
 snapshot_012_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_012_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_012_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_013_pos cleanup
 snapshot_013_pos_head()
 {
 	atf_set "descr" "Verify snapshots from 'snapshot -r' can be used for zfs send/recv"
 	atf_set "require.progs"  zfs
 }
 snapshot_013_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_013_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_013_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_014_pos cleanup
 snapshot_014_pos_head()
 {
 	atf_set "descr" "Verify creating/destroying snapshots do things clean"
 	atf_set "require.progs"  zfs
 }
 snapshot_014_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_014_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_014_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_015_pos cleanup
 snapshot_015_pos_head()
 {
 	atf_set "descr" "Verify snapshot can be created via mkdir in .zfs/snapshot."
 	atf_set "require.progs"  zfs
 }
 snapshot_015_pos_body()
 {
     atf_expect_fail "Not all directory operations on the .zfs/snapshot directory are yet supported by FreeBSD"
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_015_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_015_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_016_pos cleanup
 snapshot_016_pos_head()
 {
 	atf_set "descr" "Verify renamed snapshots via mv can be destroyed."
 	atf_set "require.progs"  zfs
 }
 snapshot_016_pos_body()
 {
 	atf_expect_fail "Not all directory operations on the .zfs/snapshot directory are yet supported by FreeBSD"
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_016_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_016_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_017_pos cleanup
 snapshot_017_pos_head()
 {
 	atf_set "descr" "Directory structure of snapshots reflects filesystem structure."
 	atf_set "require.progs"  zfs
 }
 snapshot_017_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_017_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_017_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_018_pos cleanup
 snapshot_018_pos_head()
 {
 	atf_set "descr" "Snapshot directory supports ACL operations"
 	atf_set "require.progs" zfs getfacl getconf sha1
 }
 snapshot_018_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
-	atf_expect_fail "PR 225793 pathconf(2) doesn't work in ZFS's .zfs directory"
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_018_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_018_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_test_case snapshot_019_pos cleanup
 snapshot_019_pos_head()
 {
 	atf_set "descr" "Accessing snapshots and unmounting them in parallel does not panic"
 	atf_set "require.progs" zfs
 	atf_set "timeout" 1200
 }
 snapshot_019_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	atf_skip "PR 225795 panic: found unreferenced mountpoint when accessing and unmounting snapshots in parallel"
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_019_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_019_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 atf_test_case snapshot_020_pos cleanup
 snapshot_020_pos_head()
 {
 	atf_set "descr" "Verify mounted snapshots can be renamed and destroyed"
 	atf_set "require.progs"  zfs
 }
 snapshot_020_pos_body()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed"
 	ksh93 $(atf_get_srcdir)/snapshot_020_pos.ksh || atf_fail "Testcase failed"
 }
 snapshot_020_pos_cleanup()
 {
 	. $(atf_get_srcdir)/../../include/default.cfg
 	. $(atf_get_srcdir)/snapshot.cfg
 
 	ksh93 $(atf_get_srcdir)/cleanup.ksh || atf_fail "Cleanup failed"
 }
 
 
 atf_init_test_cases()
 {
 	atf_add_test_case clone_001_pos
 	atf_add_test_case rollback_001_pos
 	atf_add_test_case rollback_002_pos
 	atf_add_test_case rollback_003_pos
 	atf_add_test_case snapshot_001_pos
 	atf_add_test_case snapshot_002_pos
 	atf_add_test_case snapshot_003_pos
 	atf_add_test_case snapshot_004_pos
 	atf_add_test_case snapshot_005_pos
 	atf_add_test_case snapshot_006_pos
 	atf_add_test_case snapshot_007_pos
 	atf_add_test_case snapshot_008_pos
 	atf_add_test_case snapshot_009_pos
 	atf_add_test_case snapshot_010_pos
 	atf_add_test_case snapshot_011_pos
 	atf_add_test_case snapshot_012_pos
 	atf_add_test_case snapshot_013_pos
 	atf_add_test_case snapshot_014_pos
 	atf_add_test_case snapshot_015_pos
 	atf_add_test_case snapshot_016_pos
 	atf_add_test_case snapshot_017_pos
 	atf_add_test_case snapshot_018_pos
 	atf_add_test_case snapshot_019_pos
 	atf_add_test_case snapshot_020_pos
 }