From: Noel Power <noel.power@suse.com>
Date: Wed, 11 Dec 2019 18:16:46 +0000 (+0000)
Subject: s3/selftest: Move various samba3.rpc.* tests to ad_dc_smb1
X-Git-Tag: ldb-2.2.0~1083
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7329c0dcf65ad649d76aa33cd6c03b6d7c4bf74;p=thirdparty%2Fsamba.git

s3/selftest: Move various samba3.rpc.* tests to ad_dc_smb1

The following tests which fail in environments that cannot negotiate
SMB1 have been moved to ad_dc_smb1 & nt4_dc_smb1

samba3.rpc.authcontext
samba3.rpc.join
samba3.rpc.samba3.bind
samba3.rpc.samba3.getusername
samba3.rpc.samba3.sharesec
samba3.rpc.samba3.smb1-pipe-name
samba3.rpc.samba3.smb-reauth1
samba3.rpc.samba3.smb-reauth2
samba3.rpc.samba3.spoolss
samba3.rpc.samba3.wkssvc

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

test entries have also been removed 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 72975b555ef..bbdd432b0ff 100644
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -101,10 +101,6 @@
 ^samba3.raw.unlink\(nt4_dc\)
 ^samba3.raw.write\(ad_dc\)
 ^samba3.raw.write\(nt4_dc\)
-^samba3.rpc.authcontext\(ad_dc\)
-^samba3.rpc.authcontext\(nt4_dc\)
-^samba3.rpc.join\(ad_dc\)
-^samba3.rpc.join\(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\)
@@ -115,26 +111,10 @@
 ^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.bind\(ad_dc\)
-^samba3.rpc.samba3.bind\(nt4_dc\)
-^samba3.rpc.samba3.getusername\(ad_dc\)
-^samba3.rpc.samba3.getusername\(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\)
-^samba3.rpc.samba3.sharesec\(ad_dc\)
-^samba3.rpc.samba3.sharesec\(nt4_dc\)
-^samba3.rpc.samba3.smb1-pipe-name\(ad_dc\)
-^samba3.rpc.samba3.smb1-pipe-name\(nt4_dc\)
-^samba3.rpc.samba3.smb-reauth1\(ad_dc\)
-^samba3.rpc.samba3.smb-reauth1\(nt4_dc\)
-^samba3.rpc.samba3.smb-reauth2\(ad_dc\)
-^samba3.rpc.samba3.smb-reauth2\(nt4_dc\)
-^samba3.rpc.samba3.spoolss\(ad_dc\)
-^samba3.rpc.samba3.spoolss\(nt4_dc\)
-^samba3.rpc.samba3.wkssvc\(ad_dc\)
-^samba3.rpc.samba3.wkssvc\(nt4_dc\)
 ^samba3.smbtorture_s3.crypt_client.ATTR\(nt4_dc\)
 ^samba3.smbtorture_s3.crypt_client.BROWSE\(nt4_dc\)
 ^samba3.smbtorture_s3.crypt_client.CASE-INSENSITIVE-CREATE\(nt4_dc\)
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 7b5571ea57e..014d38b1487 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -752,7 +752,17 @@ for t in tests:
         plansmbtorture4testsuite(t, "ad_member", '//$SERVER_IP/tmp -U$DC_USERNAME%$DC_PASSWORD')
     elif (t in base and t != "base.charset") \
         or (t in rap and t != "rap.printing") \
-        or (t in unix):
+        or (t in unix) \
+        or (t in ["rpc.authcontext",
+                  "rpc.join",
+                  "rpc.samba3.bind",
+                  "rpc.samba3.getusername",
+                  "rpc.samba3.sharesec",
+                  "rpc.samba3.smb1-pipe-name",
+                  "rpc.samba3.smb-reauth1",
+                  "rpc.samba3.smb-reauth2",
+                  "rpc.samba3.spoolss",
+                  "rpc.samba3.wkssvc",]):
         plansmbtorture4testsuite(t, "nt4_dc_smb1", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorture4testsuite(t, "ad_dc_smb1", '//$SERVER/tmp -U$USERNAME%$PASSWORD')
     else: