From: Noel Power Date: Wed, 11 Dec 2019 18:40:23 +0000 (+0000) Subject: s3/selftest: Move samba3.raw.session* to ad_dc_smb1 X-Git-Tag: ldb-2.2.0~1077 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e71c2753136f38464605c3bc476bcb65c892288d;p=thirdparty%2Fsamba.git s3/selftest: Move samba3.raw.session* to ad_dc_smb1 The following tests which fail when used with environments that don't support SMB1 fail so we move them to ad_dc_smb1 instead and also remove th entry in skip_smb1_fails samba3.raw.session ntlm samba3.raw.session krb5 Signed-off-by: Noel Power Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index 3f3a1d720fc..66f4edebdda 100644 --- a/selftest/skip_smb1_fails +++ b/selftest/skip_smb1_fails @@ -59,8 +59,6 @@ ^samba3.raw.samba3posixtimedlock brl_delay_inject2\(nt4_dc\) ^samba3.raw.search\(ad_dc\) ^samba3.raw.search\(nt4_dc\) -^samba3.raw.session krb5\(ad_dc\) -^samba3.raw.session ntlm\(ad_dc\) ^samba3.raw.session plain\(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\) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 1b482e81c5a..f3a65b03783 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -594,8 +594,8 @@ for t in tests: elif t == "raw.session": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpenc -U$USERNAME%$PASSWORD', 'enc') - plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -k no -U$USERNAME%$PASSWORD', 'ntlm') - plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -k yes -U$USERNAME%$PASSWORD', 'krb5') + plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -k no -U$USERNAME%$PASSWORD', 'ntlm') + plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -k yes -U$USERNAME%$PASSWORD', 'krb5') elif t == "smb2.session": plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD', 'plain') plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmpenc -U$USERNAME%$PASSWORD', 'enc')