summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2015-12-18 09:54:08 +0100
committerStefan Metzmacher <metze@samba.org>2016-03-10 06:52:29 +0100
commit5cf8546674a4f49618bdade1567fac00d72db454 (patch)
tree407bfb456f9c0099b743f2bd1339ef3c756ea79f
parentd9d0d2d5a2667ea8984772b678272650a8719c21 (diff)
downloadsamba-5cf8546674a4f49618bdade1567fac00d72db454.tar.gz
s4:selftest: we don't need to run ldap test with --option=socket:testnonblock=true
The LDAP client library uses tstream and that handles non blocking sockets natively. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Günther Deschner <gd@samba.org>
-rwxr-xr-xsource4/selftest/tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index b3919202bfd..f0ef6db503d 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -43,7 +43,7 @@ smbclient4 = binpath('smbclient4')
bbdir = os.path.join(srcdir(), "testprogs/blackbox")
# Simple tests for LDAP and CLDAP
-for options in ['-U"$USERNAME%$PASSWORD" --option=socket:testnonblock=true', '-U"$USERNAME%$PASSWORD"', '-U"$USERNAME%$PASSWORD" -k yes', '-U"$USERNAME%$PASSWORD" -k no', '-U"$USERNAME%$PASSWORD" -k no --sign', '-U"$USERNAME%$PASSWORD" -k no --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --sign']:
+for options in ['-U"$USERNAME%$PASSWORD"', '-U"$USERNAME%$PASSWORD" -k yes', '-U"$USERNAME%$PASSWORD" -k no', '-U"$USERNAME%$PASSWORD" -k no --sign', '-U"$USERNAME%$PASSWORD" -k no --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --encrypt', '-U"$USERNAME%$PASSWORD" -k yes --sign']:
plantestsuite("samba4.ldb.ldap with options %s(ad_dc_ntvfs)" % options, "ad_dc_ntvfs", "%s/test_ldb.sh ldap $SERVER %s" % (bbdir, options))
# see if we support ADS on the Samba3 side