diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-26 11:24:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-26 11:24:14 +0100 |
| commit | a38d46249e5c9d9f5ac0276dce1c26320436d8e5 (patch) | |
| tree | b654c4551f2ac1ddf8a49a9109e5a8e1780e766e /tests/handlers/test_typing.py | |
| parent | typo (diff) | |
| parent | Move FEDERATION_PING_INTERVAL timer. Update log line (diff) | |
| download | synapse-a38d46249e5c9d9f5ac0276dce1c26320436d8e5.tar.xz | |
Merge pull request #1140 from matrix-org/erikj/typing_fed_timeout
Time out typing over federation
Diffstat (limited to 'tests/handlers/test_typing.py')
| -rw-r--r-- | tests/handlers/test_typing.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index ea1f0f7c33..c3108f5181 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -267,10 +267,7 @@ class TypingNotificationsTestCase(unittest.TestCase): from synapse.handlers.typing import RoomMember member = RoomMember(self.room_id, self.u_apple.to_string()) self.handler._member_typing_until[member] = 1002000 - self.handler._member_typing_timer[member] = ( - self.clock.call_later(1002, lambda: 0) - ) - self.handler._room_typing[self.room_id] = set((self.u_apple.to_string(),)) + self.handler._room_typing[self.room_id] = set([self.u_apple.to_string()]) self.assertEquals(self.event_source.get_current_key(), 0) @@ -330,7 +327,7 @@ class TypingNotificationsTestCase(unittest.TestCase): }, }]) - self.clock.advance_time(11) + self.clock.advance_time(16) self.on_new_event.assert_has_calls([ call('typing_key', 2, rooms=[self.room_id]), |