From: Noel Power Date: Mon, 16 Dec 2019 17:42:54 +0000 (+0000) Subject: s4/selftest: Move samba4.ldap.nested-search to ad_dc_default_smb1 X-Git-Tag: ldb-2.2.0~1021 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15536417247d2931782e55412f6579afe0289a55;p=thirdparty%2Fsamba.git 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 Reviewed-by: Ralph Boehme --- diff --git a/selftest/skip_smb1_fails b/selftest/skip_smb1_fails index fb99dee11cb..3f03a2b832d 100644 --- 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 13b285b44bc..6e217cc9b63 100755 --- 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")