selftest: test vfs_nfs4acl_xattr with NFS 4.1 ACLs

Only tests with "nfs4:mode = simple" as mode special is supposed to be
broken anyway and simple is recommended.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index 19c0b6973bd10de173510394677351e1fabec1a7..36c1697f9a48ef82c528e849043ddf9fead3c151 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -25,6 +25,9 @@
 ^samba3.raw.acls nfs4acl_xattr-simple-40.create_owner_file\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-simple-40.create_owner_dir\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-simple-40.nulldacl\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple-41.create_owner_file\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple-41.create_owner_dir\(nt4_dc\)
+^samba3.raw.acls nfs4acl_xattr-simple-41.nulldacl\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-special-40.INHERITFLAGS\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-special-40.create_owner_file\(nt4_dc\)
 ^samba3.raw.acls nfs4acl_xattr-special-40.create_owner_dir\(nt4_dc\)

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 87191841589c6762e7e631bf6d29593a5d02a4a7..57db4fa1c60851db38599858f9a6c1bed61d0d44 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1876,6 +1876,12 @@ sub provision($$$$$$$$$)
        nfs4acl_xattr:version = 40
        vfs objects = nfs4acl_xattr xattr_tdb
 
+[nfs4acl_simple_41]
+       path = $shrdir
+       comment = smb username is [%U]
+       nfs4:mode = simple
+       vfs objects = nfs4acl_xattr xattr_tdb
+
 [xcopy_share]
        path = $shrdir
        comment = smb username is [%U]

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index bee4315845ac98da644cf20d9c6eed1dd7fcdb0e..4dc7f753fb5e2ee86034b2ffb08858646fa9e5a2 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -463,6 +463,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_simple_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-40')
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_special_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-special-40')
+        plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_simple_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-41')
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
     elif t == "smb2.ioctl":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/fs_specific -U$USERNAME%$PASSWORD', 'fs_specific')