s3/selftest: Move samba3.rpc.samba3.netlogon to ad_dc_smb1

Move test samba3.rpc.samba3.netlogon which fails in enviroments that
don't support SMB1 to ad_dc_smb1 and remove the test entry from
skip_smb1_fails

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails
index e1c07cbab81d1659939e254560d78e844fa0d75d..504bf39637ab75a95c20455263405e3d1df94a77 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -66,7 +66,6 @@
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,seal\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,sign,bigendian\] \(nt4_dc\)
 ^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,sign\] \(nt4_dc\)
-^samba3.rpc.samba3.netlogon\(ad_dc\)
 ^samba3.rpc.samba3.netlogon\(nt4_dc\)
 ^samba3.rpc.samba3.sessionkey\(ad_dc\)
 ^samba3.rpc.samba3.sessionkey\(nt4_dc\)

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 7c2fd8060bfe940edc6a0c964c06c4e3e94d9a3a..7388155875481025cd67edbc0560d9436a691944 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -725,7 +725,7 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     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')
+        plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD --option=torture:wksname=samba3rpctest')
     elif t == "smb2.streams":
         plansmbtorture4testsuite(t, "nt4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "ad_dc", '//$SERVER/tmp -U$USERNAME%$PASSWORD')