Add tests

Signed-off-by: Umer Saleem <[email protected]>

contrib/debian/openzfs-python3-libzfsacl.install

@@ -1,2 +1,3 @@
 usr/lib/python3/dist-packages/libzfsacl-*.egg-info
 usr/lib/python3/dist-packages/libzfsacl.cpython-*.so
+usr/lib/python3/dist-packages/zfsacltests/

lib/libzfsacl/Makefile.am

@@ -4,7 +4,8 @@ dist_noinst_DATA += \
 	%D%/libpyzfsacl.c \
 	%D%/libsunacl.c \
 	%D%/libzfsacl_impl_freebsd.c \
-	%D%/libzfsacl_impl_linux.c
+	%D%/libzfsacl_impl_linux.c \
+	%D%/zfsacltests
 
 SUBSTFILES += %D%/setup.py
 

lib/libzfsacl/setup.py.in

@@ -2,10 +2,11 @@ from setuptools import setup, Extension, find_packages
 import os
 import sys
 
-srcdir = '@abs_top_srcdir@/lib/libzfsacl'
-
 topsrcdir = '@abs_top_srcdir@'
 relpath_topsrcdir = os.path.relpath(topsrcdir)
+srcdir = '@abs_top_srcdir@/lib/libzfsacl'
+relpath_srcdir = os.path.relpath(srcdir)
+relpath_testdir = relpath_srcdir + '/zfsacltests'
 if sys.platform.startswith('linux'):
     src = ['libzfsacl_impl_linux.c', 'libpyzfsacl.c', 'libsunacl.c']
 else:
@@ -22,8 +23,8 @@ setup(
     author_email='[email protected]',
     url='https://docs.python.org/extending/building',
     ext_modules=[libzfsacl_mod],
-    packages=find_packages(where=srcdir),
-    package_dir={"": os.path.relpath(srcdir)},
+    packages=find_packages(where=srcdir) + ['zfsacltests'],
+    package_dir={"": relpath_srcdir, "zfsacltests": relpath_testdir},
     include_package_data=True,
     python_requires='>=3.6,<4',
     zip_safe=False,

rpm/generic/zfs.spec.in

@@ -598,3 +598,4 @@ systemctl --system daemon-reload >/dev/null || true
 %files -n python%{__python_pkg_version}-libzfsacl
 %{__python_sitelib}/libzfsacl-*/*
 %{__python_sitelib}/libzfsacl.cpython*.so
+%{__python_sitelib}/zfsacltests/*

tests/runfiles/common.run

@@ -28,6 +28,10 @@ failsafe = callbacks/zfs_failsafe
 outputdir = /var/tmp/test_results
 tags = ['functional']
 
+[tests/functional/acl/nfsv4]
+tests = ['nfsacl_001']
+tags = ['functional', 'acl', 'nfsv4']
+
 [tests/functional/acl/off]
 tests = ['dosmode', 'posixmode']
 tags = ['functional', 'acl']

tests/runfiles/sanity.run

@@ -30,6 +30,10 @@ failsafe = callbacks/zfs_failsafe
 outputdir = /var/tmp/test_results
 tags = ['functional']
 
+[tests/functional/acl/nfsv4]
+tests = ['nfsacl_001']
+tags = ['functional', 'acl', 'nfsv4']
+
 [tests/functional/acl/off]
 tests = ['posixmode']
 tags = ['functional', 'acl']

tests/zfs-tests/tests/Makefile.am

@@ -72,7 +72,8 @@ regen:
 nobase_nodist_datadir_zfs_tests_tests_DATA = \
 	functional/pam/utilities.kshlib
 nobase_nodist_datadir_zfs_tests_tests_SCRIPTS = \
-	functional/pyzfs/pyzfs_unittest.ksh
+	functional/pyzfs/pyzfs_unittest.ksh \
+	functional/acl/nfsv4/nfsacl_001.ksh
 
 SUBSTFILES += $(nobase_nodist_datadir_zfs_tests_tests_DATA) $(nobase_nodist_datadir_zfs_tests_tests_SCRIPTS)
 
@@ -387,6 +388,8 @@ nobase_dist_datadir_zfs_tests_tests_DATA += \
 	functional/idmap_mount/idmap_mount_common.kshlib
 
 nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
+	functional/acl/nfsv4/cleanup.ksh \
+	functional/acl/nfsv4/setup.ksh \
 	functional/acl/off/cleanup.ksh \
 	functional/acl/off/dosmode.ksh \
 	functional/acl/off/posixmode.ksh \

tests/zfs-tests/tests/functional/acl/nfsv4/.gitignore

@@ -0,0 +1 @@
+nfsacl_001.ksh

tests/zfs-tests/tests/functional/acl/nfsv4/cleanup.ksh

@@ -0,0 +1,37 @@
+#!/bin/ksh -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 https://opensource.org/licenses/CDDL-1.0.
+# 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 2023 iXsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/acl/acl_common.kshlib
+
+cleanup_user_group
+
+default_cleanup
+
+if is_freebsd; then
+    mv /usr/bin/fortune_bak /usr/bin/fortune
+fi

tests/zfs-tests/tests/functional/acl/nfsv4/nfsacl_001.ksh.in

@@ -0,0 +1,39 @@
+#!/bin/ksh -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 https://opensource.org/licenses/CDDL-1.0.
+# 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 2023 iXsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/acl/acl_common.kshlib
+
+verify_runnable "global"
+log_assert "Verify NFSv4 ACLs behave correctly"
+
+@PYTHON@ -m unittest --verbose zfsacltests.test_nfsv4acl
+if [ $? -ne 0 ]; then
+	log_fail "Python unittest completed with errors"
+fi
+
+log_pass "Python unittest completed without errors"

tests/zfs-tests/tests/functional/acl/nfsv4/setup.ksh

@@ -0,0 +1,50 @@
+#!/bin/ksh -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 https://opensource.org/licenses/CDDL-1.0.
+# 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 2023 iXsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/acl/acl_common.kshlib
+
+cleanup_user_group
+
+# Create staff group and add user to it
+log_must add_group $ZFS_ACL_STAFF_GROUP
+log_must add_user $ZFS_ACL_STAFF_GROUP $ZFS_ACL_STAFF1
+log_must add_user $ZFS_ACL_STAFF_GROUP $ZFS_ACL_STAFF2
+
+if is_freebsd; then
+    mv /usr/bin/fortune /usr/bin/fortune_bak
+    cp /usr/bin/true /usr/bin/fortune
+fi
+
+DISK=${DISKS%% *}
+default_setup_noexit $DISK
+log_must chmod 777 $TESTDIR
+
+# Use NFSv4 ACLs on filesystem
+log_must zfs set acltype=nfsv4 $TESTPOOL/$TESTFS
+
+log_pass