1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00

s3/selftest: Move various samba3.raw tests to _smb1 env

The following tests which fail when used in environment that
SMB1 cannot be negotiated in have been moved to ad_dc_smb1
& nt4_dc_smb1

samba3.raw.close(ad_dc_smb1)
samba3.raw.composite(ad_dc_smb1)
samba3.raw.eas(ad_dc_smb1)
samba3.raw.mkdir(ad_dc_smb1)
samba3.raw.open(ad_dc_smb1)
samba3.raw.rename(ad_dc_smb1)
samba3.raw.samba3badnameblob(ad_dc_smb1)
samba3.raw.samba3badpath(ad_dc_smb1)
samba3.raw.samba3caseinsensitive(ad_dc_smb1)
samba3.raw.samba3oplocklogoff(ad_dc_smb1)
samba3.raw.samba3rootdirfid(ad_dc_smb1)
samba3.raw.sfileinfo.bug(ad_dc_smb1)
samba3.raw.sfileinfo.end-of-file(ad_dc_smb1)
samba3.raw.sfileinfo.rename(ad_dc_smb1)
samba3.raw.streams(ad_dc_smb1)
samba3.raw.unlink(ad_dc_smb1)
samba3.raw.write(ad_dc_smb1)

verified with
   python3 source3/selftest/tests.py  | grep ad_dc_smb1 | grep "^samba3.raw" | sort -u

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Noel Power 2020-01-07 10:27:12 +00:00 committed by Ralph Boehme
parent f7329c0dcf
commit 90a493acdf
2 changed files with 21 additions and 38 deletions

View File

@ -45,62 +45,26 @@
^samba3.raw.acls\(nt4_dc\)
^samba3.raw.chkpath\(ad_dc\)
^samba3.raw.chkpath\(nt4_dc\)
^samba3.raw.close\(ad_dc\)
^samba3.raw.close\(nt4_dc\)
^samba3.raw.composite\(ad_dc\)
^samba3.raw.composite\(nt4_dc\)
^samba3.raw.eas\(ad_dc\)
^samba3.raw.eas\(nt4_dc\)
^samba3.raw.lock\(nt4_dc\)
^samba3.raw.mkdir\(ad_dc\)
^samba3.raw.mkdir\(nt4_dc\)
^samba3.raw.notify\(nt4_dc\)
^samba3.raw.open\(ad_dc\)
^samba3.raw.open\(nt4_dc\)
^samba3.raw.oplock\(nt4_dc\)
^samba3.raw.read\(ad_dc\)
^samba3.raw.read aio\(nt4_dc\)
^samba3.raw.read\(nt4_dc\)
^samba3.raw.rename\(ad_dc\)
^samba3.raw.rename\(nt4_dc\)
^samba3.raw.samba3badnameblob\(ad_dc\)
^samba3.raw.samba3badnameblob\(nt4_dc\)
^samba3.raw.samba3badpath\(ad_dc\)
^samba3.raw.samba3badpath\(nt4_dc\)
^samba3.raw.samba3caseinsensitive\(ad_dc\)
^samba3.raw.samba3caseinsensitive\(nt4_dc\)
^samba3.raw.samba3checkfsp\(nt4_dc\)
^samba3.raw.samba3checkfsp\(simpleserver\)
^samba3.raw.samba3closeerr\(simpleserver\)
^samba3.raw.samba3hide\(nt4_dc\)
^samba3.raw.samba3hide\(simpleserver\)
^samba3.raw.samba3oplocklogoff\(ad_dc\)
^samba3.raw.samba3oplocklogoff\(nt4_dc\)
^samba3.raw.samba3posixtimedlock\(ad_dc\)
^samba3.raw.samba3posixtimedlock\(nt4_dc\)
^samba3.raw.samba3posixtimedlock brl_delay_inject1\(nt4_dc\)
^samba3.raw.samba3posixtimedlock brl_delay_inject2\(nt4_dc\)
^samba3.raw.samba3posixtimedlock\(nt4_dc\)
^samba3.raw.samba3rootdirfid\(ad_dc\)
^samba3.raw.samba3rootdirfid\(nt4_dc\)
^samba3.raw.search\(ad_dc\)
^samba3.raw.search\(nt4_dc\)
^samba3.raw.seek\(ad_dc\)
^samba3.raw.seek\(nt4_dc\)
^samba3.raw.session krb5\(ad_dc\)
^samba3.raw.session ntlm\(ad_dc\)
^samba3.raw.session plain\(nt4_dc\)
^samba3.raw.sfileinfo.bug\(ad_dc\)
^samba3.raw.sfileinfo.bug\(nt4_dc\)
^samba3.raw.sfileinfo.end-of-file\(ad_dc\)
^samba3.raw.sfileinfo.end-of-file\(nt4_dc\)
^samba3.raw.sfileinfo.rename\(ad_dc\)
^samba3.raw.sfileinfo.rename\(nt4_dc\)
^samba3.raw.streams\(ad_dc\)
^samba3.raw.streams\(nt4_dc\)
^samba3.raw.unlink\(ad_dc\)
^samba3.raw.unlink\(nt4_dc\)
^samba3.raw.write\(ad_dc\)
^samba3.raw.write\(nt4_dc\)
^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,bigendian\] \(nt4_dc\)
^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect,bigendian\] \(nt4_dc\)
^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,connect\] \(nt4_dc\)

View File

@ -762,7 +762,26 @@ for t in tests:
"rpc.samba3.smb-reauth1",
"rpc.samba3.smb-reauth2",
"rpc.samba3.spoolss",
"rpc.samba3.wkssvc",]):
"rpc.samba3.wkssvc",]) \
or (t in ["raw.close",
"raw.composite",
"raw.eas",
"raw.mkdir",
"raw.open",
"raw.rename",
"raw.samba3badnameblob",
"raw.samba3badpath",
"raw.samba3caseinsensitive",
"raw.samba3oplocklogoff",
"raw.samba3posixtimedlock",
"raw.samba3rootdirfid",
"raw.seek",
"raw.sfileinfo.bug",
"raw.sfileinfo.end-of-file",
"raw.sfileinfo.rename",
"raw.streams",
"raw.unlink",
"raw.write",]) :
plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
else: