summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2016-06-22 17:23:07 +0100
committerGitHub <noreply@github.com>2016-06-22 17:23:07 +0100
commit9fe894402fe899d9c8c2f165b9822ad45483f61a (patch)
treea4645bede5b25546246eea46c969c67e8ac79899 /tests/utils.py
parentMerge pull request #888 from matrix-org/markjh/content_repo (diff)
parentRework ldap integration with ldap3 (diff)
downloadsynapse-9fe894402fe899d9c8c2f165b9822ad45483f61a.tar.xz
Merge pull request #843 from mweinelt/ldap3-rewrite
Rewrite LDAP Authentication against ldap3
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 6e41ae1ff6..ed547bc39b 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -56,6 +56,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
 
     config.use_frozen_dicts = True
     config.database_config = {"name": "sqlite3"}
+    config.ldap_enabled = False
 
     if "clock" not in kargs:
         kargs["clock"] = MockClock()