From: Noel Power Date: Wed, 11 Dec 2019 18:44:00 +0000 (+0000) Subject: s3/selftest: Move samba3.raw.acls to ad_dc_smb1 env X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=59eb2724891c6132914231e1a027c59c1f9ac43d;p=bbaumbach%2Fsamba-autobuild%2F.git s3/selftest: Move samba3.raw.acls to ad_dc_smb1 env Test samba3.raw.acls fails in environments that don't support SMB1 so move it to ad_dc_smb1 and remove the entry in skip_smb1_fails Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 3f4e12daf7a..99803fb8d41 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -31,7 +31,6 @@ ^samba3.blackbox.smbclient_s3.NT1.sign.member_creds\(nt4_member\) ^samba3.blackbox.smbclient_s3.NT1.sign\(nt4_dc\) ^samba3.rap.sam\(nt4_dc\) -^samba3.raw.acls\(ad_dc\) ^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\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 66d27763404..cf20b965bd3 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -649,7 +649,7 @@ for t in tests: 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, "ad_dc", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') + 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') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')