diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-06 18:18:55 +0100 |
| commit | d12feed6235ec91e9797a47c98e9da162b6559c9 (patch) | |
| tree | 57f47c24ee7a402f210d7cb07f08521dfba6867c /tests | |
| parent | Minor spec tweaks. (diff) | |
| parent | Center recaptcha dialog. (diff) | |
| download | synapse-d12feed6235ec91e9797a47c98e9da162b6559c9.tar.xz | |
Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse v0.2.2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/rest/test_events.py | 1 | ||||
| -rw-r--r-- | tests/test_state.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/rest/test_events.py b/tests/rest/test_events.py index 1dccf4c503..fd2224f55f 100644 --- a/tests/rest/test_events.py +++ b/tests/rest/test_events.py @@ -145,6 +145,7 @@ class EventStreamPermissionsTestCase(RestTestCase): ) self.ratelimiter = hs.get_ratelimiter() self.ratelimiter.send_message.return_value = (True, 0) + hs.config.enable_registration_captcha = False hs.get_handlers().federation_handler = Mock() diff --git a/tests/test_state.py b/tests/test_state.py index a1f5ee869b..b01496c40f 100644 --- a/tests/test_state.py +++ b/tests/test_state.py @@ -240,6 +240,7 @@ class StateTestCase(unittest.TestCase): @defer.inlineCallbacks def test_new_event(self): event = Mock() + event.event_id = "12123123@test" state_pdu = new_fake_pdu_entry("C", "test", "mem", "x", "A", 20) |