From: Noel Power Date: Mon, 16 Dec 2019 16:01:33 +0000 (+0000) Subject: s3/selftest: Move tests raw.samba3hide, raw.samba3checkfsp & raw.samba3closeerr X-Git-Tag: ldb-2.2.0~1028 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2b1cca4c51443797d63d9af8000bd58901cc34cf;p=thirdparty%2Fsamba.git s3/selftest: Move tests raw.samba3hide, raw.samba3checkfsp & raw.samba3closeerr Move tests raw.samba3hide, raw.samba3checkfsp & raw.samba3closeerr from simpleserver to fileserver. Also need a knownfail for raw.samba3closeerr which fails in envs that NT ACLs enabled. We will get extra coverage from ad_dc_smb1 when the same tests are moved there. Remove the associated entries from skip_smb1_fail Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/knownfail b/selftest/knownfail index 77d16e78b35..3544fa1a1f7 100644 --- a/selftest/knownfail +++ b/selftest/knownfail @@ -26,6 +26,7 @@ ^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_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. ^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\) diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 4e0cc7c1d0d..168adc76b64 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -19,9 +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.samba3checkfsp\(simpleserver\) -^samba3.raw.samba3closeerr\(simpleserver\) -^samba3.raw.samba3hide\(simpleserver\) ^samba3.smbtorture_s3.hidenewfiles\(simpleserver\)\(simpleserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW1\(simpleserver\) ^samba3.smbtorture_s3.vfs_aio_fork\(simpleserver\).RW2\(simpleserver\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 23bd61f8a8a..61523151d91 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -605,7 +605,7 @@ for t in tests: plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER_IP/tmpcase -U$USERNAME%$PASSWORD') 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, "simpleserver", '//$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') elif t == "raw.session": plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain')