s3/selftest: Move samba3.rpc.lsa.lookupsids to nt4_dc_smb1

Test samba3.rpc.lsa.lookupsids when run with protocol options specifying
smb1 will of course fail when run against environments the don't support
SMB1 so move such tests to nt4_dc_smb1

Additionally remove those entries from the skip file as porting is
not needed.

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 174f616c5d1c20b4dff0e55c0946a808e966aedd..d716d74f63927883ea04c259e78dd1798cc85899 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -22,16 +22,6 @@
 ^samba3.raw.samba3checkfsp\(simpleserver\)
 ^samba3.raw.samba3closeerr\(simpleserver\)
 ^samba3.raw.samba3hide\(simpleserver\)
-^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\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,packet,bigendian\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,packet\] \(nt4_dc\)
-^samba3.rpc.lsa.lookupsids over ncacn_np with \[spnego,smb1,seal,bigendian\] \(nt4_dc\)
-^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\(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 71e4570edf49a3c75a84b2cec50811a99c2ccc7a..b70f3b680e6ec550ba5ad16776d15fa8a48c3499 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -817,7 +817,10 @@ for s in signseal_options:
         for a in auth_options:
             binding_string = "ncacn_np:$SERVER[%s%s%s]" % (a, s, e)
             options = binding_string + " -U$USERNAME%$PASSWORD"
-            plansmbtorture4testsuite(test, "nt4_dc", options, 'over ncacn_np with [%s%s%s] ' % (a, s, e))
+            if "smb1" in a:
+                plansmbtorture4testsuite(test, "nt4_dc_smb1_done", options, 'over ncacn_np with [%s%s%s] ' % (a, s, e))
+            else:
+                plansmbtorture4testsuite(test, "nt4_dc", options, 'over ncacn_np with [%s%s%s] ' % (a, s, e))
             plantestsuite("samba3.blackbox.rpcclient over ncacn_np with [%s%s%s] " % (a, s, e), "nt4_dc:local", [os.path.join(samba3srcdir, "script/tests/test_rpcclient.sh"),
                                                                                                                  "none", options, configuration])