sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4-smbtorture: Run tests for nfs4:modes simple and special.

Browse Source 
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Alexander Werth 2013-04-28 19:06:59 +02:00 committed by Andrew Bartlett
parent 381812e9f6
commit 6fa3f7d0f4
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
selftest/knownfail
View File

@ -45,13 +45,22 @@
^samba3.blackbox.smbclient_machine_auth.plain \(s3dc:local\)# the S3dc does not currently set up a self-join
^samba3.raw.samba3hide.samba3hide\((s3dc|plugin_s4_dc)\) # This test fails against an smbd environment with NT ACLs enabled
^samba3.raw.samba3closeerr.samba3closeerr\(s3dc\) # This test fails against an smbd environment with NT ACLs enabled
^samba3.raw.acls nfs4acl_xattr.INHERITFLAGS\(s3dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet.
^samba3.raw.acls nfs4acl_xattr.sd\(s3dc\)
^samba3.raw.acls nfs4acl_xattr.create_file\(s3dc\)
^samba3.raw.acls nfs4acl_xattr.create_dir\(s3dc\)
^samba3.raw.acls nfs4acl_xattr.nulldacl\(s3dc\)
^samba3.raw.acls nfs4acl_xattr.generic\(s3dc\)
^samba3.raw.acls nfs4acl_xattr.inheritance\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-simple.INHERITFLAGS\(s3dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet.
^samba3.raw.acls nfs4acl_xattr-simple.sd\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-simple.create_file\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-simple.create_dir\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-simple.nulldacl\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-simple.generic\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-simple.inheritance\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.INHERITFLAGS\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.sd\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.create_file\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.create_dir\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.nulldacl\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.generic\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.inheritance\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_owner\(s3dc\)
^samba3.raw.acls nfs4acl_xattr-special.inherit_creator_group\(s3dc\)
^samba3.base.delete.deltest16a
^samba3.base.delete.deltest17a
^samba3.unix.whoami anonymous connection.whoami\(plugin_s4_dc\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token

9
selftest/target/Samba3.pm
View File

@ -1082,9 +1082,16 @@ sub provision($$$$$$)
[lp]
copy = print1
[nfs4acl_share]
[nfs4acl_simple]
path = $shrdir
comment = smb username is [%U]
nfs4:mode = simple
vfs objects = $vfs_modulesdir_abs/nfs4acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so
[nfs4acl_special]
path = $shrdir
comment = smb username is [%U]
nfs4:mode = special
vfs objects = $vfs_modulesdir_abs/nfs4acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so
[xcopy_share]

3
source3/selftest/tests.py
View File

@ -345,7 +345,8 @@ for t in tests:
plantestsuite(t, "s3member_rfc2307", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_rfc2307.sh"), '$DOMAIN', 'Administrator', '2000000', '"Domain Users"', '2000001', 'ou=idmap,dc=samba,dc=example,dc=com', '$DC_SERVER', '$DC_USERNAME', '$DC_PASSWORD'])
elif t == "raw.acls":
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/nfs4acl_share -U$USERNAME%$PASSWORD', description='nfs4acl_xattr')
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/nfs4acl_simple -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple')
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/nfs4acl_special -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-special')
plansmbtorture4testsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD')
else:
plansmbtorture4testsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')