summary refs log tree commit diff
path: root/tests/rest
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/rest
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 '')
-rw-r--r--tests/rest/client/v1/test_events.py1
1 files changed, 1 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()