From 9161cf7495c8415d919a580174fab58a0bfda0e4 Mon Sep 17 00:00:00 2001 From: Noel Power Date: Mon, 16 Dec 2019 16:07:34 +0000 Subject: [PATCH] s3/selftest: Move tests raw.samba3hide, raw.samba3checkfsp & raw.samba3closeerr Move tests raw.samba3hide, raw.samba3checkfsp & raw.samba3closeerr from ad_dc to ad_dc_smb1. Also update flapping and knownfail entries to cater for the new env. no entries in skip files to be removed as flapping & knownfail negate the need for this. Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- selftest/flapping | 4 ++-- selftest/knownfail | 2 +- source3/selftest/tests.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/selftest/flapping b/selftest/flapping index 50fdf1ed972..c9f0adbf1bd 100644 --- a/selftest/flapping +++ b/selftest/flapping @@ -23,8 +23,8 @@ ^samba3.smb2.acls.DYNAMIC\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 ^samba3.raw.acls.dynamic\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 ^samba3.raw.acls.inheritance\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 -^samba3.raw.samba3checkfsp.samba3checkfsp\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 -^samba3.raw.samba3closeerr.samba3closeerr\(ad_dc\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 +^samba3.raw.samba3checkfsp.samba3checkfsp\(ad_dc_smb1\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 +^samba3.raw.samba3closeerr.samba3closeerr\(ad_dc_smb1\) # Seems to flap - succeeds on sn-devel, fails on Fedora 16 ^samba4.smb2.create.mkdir-dup\(ad_dc_ntvfs\) # This test (for bug 11486) involves a race, not always protected against in the NTVFS file server ^samba4.winbind.struct.domain_info.ad_member # flakey on sn-devel-104 and sn-devel-144 # diff --git a/selftest/knownfail b/selftest/knownfail index 3544fa1a1f7..51efa4bdd58 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -24,7 +24,7 @@ ^samba3.smb2.rename.*.simple_nodelete ^samba3.smb2.rename.*.no_share_delete_no_delete_access ^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.samba3hide.samba3hide\(ad_dc_smb1\) # This test fails against the ad_dc environment. ^samba3.raw.samba3closeerr.samba3closeerr\(nt4_dc_smb1\) # This test fails against an smbd environment with NT ACLs enabled ^samba3.raw.samba3closeerr.samba3closeerr\(fileserver_smb1\) # This test fails against an smbd environment with NT ACLs enabled ^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. diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 61523151d91..6d052230b46 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -606,7 +606,7 @@ for t in tests: elif t == "raw.samba3hide" or t == "raw.samba3checkfsp" or t == "raw.samba3closeerr": plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') plansmbtorture4testsuite(t, "fileserver_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD') - plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD') + plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD') elif t == "raw.session": plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain') plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmpenc -U$USERNAME%$PASSWORD', 'enc') -- 2.47.3