From: Noel Power Date: Fri, 13 Dec 2019 12:01:49 +0000 (+0000) Subject: s3/selftest: Move samba3.raw.acls* to nt4_dc_smb1 X-Git-Tag: ldb-2.2.0~1049 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c9b13ca09fcd3461be8bd775170f03fbfa3b8ea7;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.raw.acls* to nt4_dc_smb1 Tests samba3.raw.acls* don't succeed in environments that don't support SMB1 so move them to nt4_dc_smb1 Also need to adjust knownfail for samba3.raw.acls nfs4acl_xattr* Additionally remove the entries for test from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/knownfail b/selftest/knownfail index ff867e21e69..051b7d6317d 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -26,37 +26,37 @@ ^samba3.blackbox.smbclient_machine_auth.plain.*nt4_dc:local # the NT4 DC does not currently set up a self-join ^samba3.raw.samba3hide.samba3hide\(ad_dc\) # This test fails against the ad_dc environment. ^samba3.raw.samba3closeerr.samba3closeerr\(nt4_dc\) # This test fails against an smbd environment with NT ACLs enabled -^samba3.raw.acls nfs4acl_xattr-simple-40.INHERITFLAGS\(nt4_dc\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet. -^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\) -^samba3.raw.acls nfs4acl_xattr-special-40.nulldacl\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-special-40.inherit_creator_owner\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-simple-40.INHERITFLAGS\(nt4_dc_smb1\) # This (and the follow nfs4acl_xattr tests fail because our NFSv4 backend isn't a complete mapping yet. +^samba3.raw.acls nfs4acl_xattr-simple-40.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-simple-40.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-simple-40.nulldacl\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-simple-41.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-simple-41.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-simple-41.nulldacl\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-special-40.INHERITFLAGS\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-special-40.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-special-40.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-special-40.nulldacl\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-special-40.inherit_creator_owner\(nt4_d_smb1\) ^samba3.raw.acls nfs4acl_xattr-special-40.inherit_creator_group\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40.INHERITFLAGS\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40.create_owner_file\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40.create_owner_dir\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40.nulldacl\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40.inherit_creator_owner\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40.inherit_creator_group\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-41.create_owner_file\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-41.create_owner_dir\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-41.nulldacl\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-40.INHERITFLAGS\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-40.create_owner_file\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-40.create_owner_dir\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-40.nulldacl\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-40.inherit_creator_owner\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-40.inherit_creator_group\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-41.create_owner_file\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-41.create_owner_dir\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-41.nulldacl\(nt4_dc\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.INHERITFLAGS\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.nulldacl\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.inherit_creator_owner\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-40.inherit_creator_group\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-41.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-41.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-xdr-41.nulldacl\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-40.INHERITFLAGS\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-40.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-40.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-40.nulldacl\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-40.inherit_creator_owner\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-40.inherit_creator_group\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-41.create_owner_file\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-41.create_owner_dir\(nt4_dc_smb1\) +^samba3.raw.acls nfs4acl_xattr-nfs-41.nulldacl\(nt4_dc_smb1\) ^samba3.base.delete.deltest16a ^samba3.base.delete.deltest17a ^samba3.unix.whoami anonymous connection.whoami\(ad_dc_smb1\) # We need to resolve if we should be including SID_NT_WORLD and SID_NT_NETWORK in this token diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index f47b4273fba..90e9a864259 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -19,14 +19,6 @@ ^samba3.blackbox.smbclient_s3.NT1.plain.member_creds\(nt4_member\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(ad_member\) ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\) -^samba3.raw.acls nfs4acl_xattr-nfs-40\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-nfs-41\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-simple-40\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-simple-41\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-special-40\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-40\(nt4_dc\) -^samba3.raw.acls nfs4acl_xattr-xdr-41\(nt4_dc\) -^samba3.raw.acls\(nt4_dc\) ^samba3.raw.chkpath\(nt4_dc\) ^samba3.raw.notify\(nt4_dc\) ^samba3.raw.oplock\(nt4_dc\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index e19a47ea95a..432b510acdd 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -650,14 +650,14 @@ for t in tests: elif t == "idmap.ad": plantestsuite(t, "ad_member_idmap_ad", [os.path.join(samba3srcdir, "../nsswitch/tests/test_idmap_ad.sh"), '$DOMAIN', '$DC_SERVER', '$DC_PASSWORD', '$TRUST_DOMAIN', '$TRUST_SERVER', '$TRUST_PASSWORD']) elif t == "raw.acls": - 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, "nt4_dc", '//$SERVER_IP/nfs4acl_xdr_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-xdr-40') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_xdr_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-xdr-41') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_nfs_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-nfs-40') - plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/nfs4acl_nfs_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-nfs-41') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_simple_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-40') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_special_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-special-40') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_simple_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-simple-41') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_xdr_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-xdr-40') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_xdr_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-xdr-41') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_nfs_40 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-nfs-40') + plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/nfs4acl_nfs_41 -U$USERNAME%$PASSWORD', description='nfs4acl_xattr-nfs-41') plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') elif t == "smb2.ioctl": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/fs_specific -U$USERNAME%$PASSWORD', 'fs_specific')