sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

selftest: Consolidate planning libsmbclient tests to source4

Browse Source 
We don't need to plan those tests both in source3 and source4's
tests.py. The source4 version seems more "advanced", it uses
smbtorture4_testsuites() to list all tests, making it less
error-prone, and it also does the tests for all SMB1 and SMB3

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2020-02-23 12:22:47 +01:00 committed by Jeremy Allison
parent 8f50e4fa12
commit ae76d21834
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/selftest/tests.py
View File

@ -539,13 +539,6 @@ unix = ["unix.info2", "unix.whoami"]
nbt = ["nbt.dgram"]
libsmbclient = ["libsmbclient.version", "libsmbclient.initialize",
"libsmbclient.configuration", "libsmbclient.setConfiguration",
"libsmbclient.options", "libsmbclient.opendir",
"libsmbclient.list_shares", "libsmbclient.readdirplus",
"libsmbclient.readdirplus_seek",
"libsmbclient.readdirplus2"]
vfs = [
"vfs.fruit",
"vfs.acl_xattr",
@ -556,7 +549,7 @@ vfs = [
"vfs.unfruit",
]
tests = base + raw + smb2 + rpc + unix + local + rap + nbt + libsmbclient + idmap + vfs
tests = base + raw + smb2 + rpc + unix + local + rap + nbt + idmap + vfs
for t in tests:
if t == "base.delaywrite" or t == "base.deny1" or t == "base.deny2":
@ -729,17 +722,6 @@ for t in tests:
elif t == "rpc.samba3.netlogon" or t == "rpc.samba3.sessionkey":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD --option=torture:wksname=samba3rpctest')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD --option=torture:wksname=samba3rpctest')
elif t.startswith("libsmbclient"):
url = "smb://$USERNAME:$PASSWORD@$SERVER/tmp"
if t == "libsmbclient.list_shares":
url = "smb://$USERNAME:$PASSWORD@$SERVER"
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%%$PASSWORD '
'--option=torture:smburl=' + url +
' --option=torture:replace_smbconf=%s' % os.path.join(srcdir(), "testdata/samba3/smb_new.conf"))
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%%$PASSWORD '
'--option=torture:smburl=' + url +
' --option=torture:replace_smbconf=%s' % os.path.join(srcdir(), "testdata/samba3/smb_new.conf"))
elif t == "smb2.streams":
plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')