s4/selftest: Move samba4.ldap.nested-search to ad_dc_default_smb1

Test samba4.ldap.nested-search fails when run against test env
that doesn't support SMB1 so move to ad_dc_default_smb1

Also remove entry 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 fb99dee11cb1dd2e315c8f04db5ef435f33e44a2..3f03a2b832de6f96cafce0f535b2e43a713698f5 100644 (file)
--- a/selftest/skip_smb1_fails
+++ b/selftest/skip_smb1_fails
@@ -28,7 +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.ldap.nested-search\(ad_dc_default\)
 ^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\)

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 13b285b44bc373a5124fbc28809bd2792cada9e6..6e217cc9b63b6f0fe1b000a106b423b89814cdce 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -154,7 +154,10 @@ for options in ['-U"$USERNAME%$PASSWORD"']:
                   "%s/test_ldb.sh ldapi $PREFIX_ABS/ad_dc_ntvfs/private/ldapi %s" % (bbdir, options))
 
 for t in smbtorture4_testsuites("ldap."):
-    plansmbtorture4testsuite(t, "ad_dc_default", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
+    if t == "ldap.nested-search":
+        plansmbtorture4testsuite(t, "ad_dc_default_smb1", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
+    else:
+        plansmbtorture4testsuite(t, "ad_dc_default", '-U"$USERNAME%$PASSWORD" //$SERVER_IP/_none_')
 
 for t in smbtorture4_testsuites("dsdb."):
     plansmbtorture4testsuite(t, "ad_dc:local", "localhost")