diff options
| author | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
|---|---|---|
| committer | kaiyou <pierre@jaury.eu> | 2018-05-02 20:22:41 +0200 |
| commit | 9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6 (patch) | |
| tree | 1034b986ea37a081707b489cb3ebe6e4d584defe /tests/rest/client/v1/test_events.py | |
| parent | Make the logging level configurable (diff) | |
| parent | missing word :| (diff) | |
| download | synapse-9a779c2ddb88f875d3ceec4ff02bdb922a0c57c6.tar.xz | |
Merge remote-tracking branch 'upstream/master' into feat-dockerfile
Diffstat (limited to 'tests/rest/client/v1/test_events.py')
| -rw-r--r-- | tests/rest/client/v1/test_events.py | 1 |
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 2b89c0a3c7..a8d09600bd 100644 --- a/tests/rest/client/v1/test_events.py +++ b/tests/rest/client/v1/test_events.py @@ -123,6 +123,7 @@ class EventStreamPermissionsTestCase(RestTestCase): self.ratelimiter.send_message.return_value = (True, 0) hs.config.enable_registration_captcha = False hs.config.enable_registration = True + hs.config.auto_join_rooms = [] hs.get_handlers().federation_handler = Mock() |