summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-23 14:36:00 +0000
committerErik Johnston <erik@matrix.org>2015-02-23 14:36:00 +0000
commite25e0f4da9ac04aab6bcaacef3d2950963f673da (patch)
tree4cfd61797f83c9ef7c6c3328faad52797560f313 /tests
parentRevert get_auth_chain changes (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-e25e0f4da9ac04aab6bcaacef3d2950963f673da.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pdu
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v1/test_events.py1
-rw-r--r--tests/utils.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_events.py b/tests/rest/client/v1/test_events.py
index f36340121d..36b0f2ff6d 100644
--- a/tests/rest/client/v1/test_events.py
+++ b/tests/rest/client/v1/test_events.py
@@ -128,6 +128,7 @@ class EventStreamPermissionsTestCase(RestTestCase):
         self.ratelimiter = hs.get_ratelimiter()
         self.ratelimiter.send_message.return_value = (True, 0)
         hs.config.enable_registration_captcha = False
+        hs.config.disable_registration = False
 
         hs.get_handlers().federation_handler = Mock()
 
diff --git a/tests/utils.py b/tests/utils.py
index 110b9f86b8..81e82a80df 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -42,6 +42,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
         config = Mock()
         config.signing_key = [MockKey()]
         config.event_cache_size = 1
+        config.disable_registration = False
 
     if datastore is None:
         db_pool = SQLiteMemoryDbPool()