s4/selftest: Move samba4.rpc.join tests to ad_dc_default_smb1

The following tests which fail when run against a test env that
doesn't support SMB1

samba4.rpc.join on ncacn_ip_tcp with bigendian(ad_dc_default)
samba4.rpc.join on ncacn_ip_tcp with seal,padcheck(ad_dc_default)
samba4.rpc.join on ncacn_ip_tcp with validate(ad_dc_default)
samba4.rpc.join on ncacn_np with bigendian(ad_dc_default)
samba4.rpc.join on ncacn_np with seal,padcheck(ad_dc_default)
samba4.rpc.join on ncacn_np with validate(ad_dc_default)
samba4.rpc.join on ncalrpc with bigendian(ad_dc_default:local)
samba4.rpc.join on ncalrpc with seal,padcheck(ad_dc_default:local)
samba4.rpc.join on ncalrpc with validate(ad_dc_default:local)

have been moved to ad_dc_default_smb1

results verified with

VALIDATE="validate" python3 source4/selftest/tests.py | grep "^samba4.rpc.join" | grep ad_dc_default | sort

corrosponding entries have been removed from skip_smb1_fail

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 3f03a2b832de6f96cafce0f535b2e43a713698f5..532ab7e7aa52b25421484e5493349e685097690c 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -28,15 +28,6 @@
 ^samba3.unix.whoami ntlm user@realm\(ad_member\)
 ^samba4.blackbox.smbclient\(ad_member:local\)\(ad_member:local\)
 ^samba4.blackbox.smbclient\(chgdcpass:local\)\(chgdcpass:local\)
-^samba4.rpc.join on ncacn_ip_tcp with bigendian\(ad_dc_default\)
-^samba4.rpc.join on ncacn_ip_tcp with seal,padcheck\(ad_dc_default\)
-^samba4.rpc.join on ncacn_ip_tcp with validate\(ad_dc_default\)
-^samba4.rpc.join on ncacn_np with bigendian\(ad_dc_default\)
-^samba4.rpc.join on ncacn_np with seal,padcheck\(ad_dc_default\)
-^samba4.rpc.join on ncacn_np with validate\(ad_dc_default\)
-^samba4.rpc.join on ncalrpc with bigendian\(ad_dc_default:local\)
-^samba4.rpc.join on ncalrpc with seal,padcheck\(ad_dc_default:local\)
-^samba4.rpc.join on ncalrpc with validate\(ad_dc_default:local\)
 ^samba4.smb.signing disabled on with -k no --option=gensec:spengo=no --signing=off domain-creds\(ad_member\)
 ^samba4.smb.signing disabled on with -k no --signing=off domain-creds\(ad_member\)
 ^samba4.smb.signing disabled on with -k yes --signing=off domain-creds\(ad_member\)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 0ef98722ca5574ac0d87efa4646e7bd3075eec89..565f7ae1375a3f183b5ece6d517564760c72877a 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -210,6 +210,8 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
         for t in tests:
             if t == "rpc.netlogon":
                 env = "ad_dc_ntvfs"
+            elif t == "rpc.join":
+                env = "ad_dc_default_smb1"
             plansmbtorture4testsuite(t, env + local, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
         plansmbtorture4testsuite('rpc.samba3-sharesec', env + local, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions))
 
@@ -228,6 +230,8 @@ for bindoptions in [""] + validate_list + ["bigendian"]:
         env = "ad_dc_default"
         if t in ["rpc.srvsvc", "rpc.mgmt"]:
             env = "ad_dc_ntvfs"
+        elif t == "rpc.join":
+            env = "ad_dc_default_smb1"
         plansmbtorture4testsuite(t, env, ["$SERVER[%s]" % bindoptions, '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s with %s" % (t, bindoptions))
 
 t = "rpc.countcalls"