summary refs log tree commit diff
path: root/tests/rest/client/v1/test_events.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-02-23 17:16:03 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-02-23 17:16:03 +0000
commitbd84755e64a5fd086738a43e049885604ea53927 (patch)
tree39b3bf10a5b074c82e48a723670a539b9149a8ee /tests/rest/client/v1/test_events.py
parentPull the _get_event_cache.setdefault() call out of the try block, as it doesn... (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-bd84755e64a5fd086738a43e049885604ea53927.tar.xz
Merge remote-tracking branch 'origin/develop' into performance-cache-improvements
Diffstat (limited to 'tests/rest/client/v1/test_events.py')
-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()