diff options
| author | David Baker <dave@matrix.org> | 2016-06-02 17:20:56 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-06-02 17:20:56 +0100 |
| commit | c71177f285fc21cef48912e138956a7b10f57f9e (patch) | |
| tree | c8ee989d97e041b98c7f2d21f8dfadaa9457d6b7 /tests | |
| parent | Merge remote-tracking branch 'origin/develop' into dbkr/email_unsubscribe (diff) | |
| parent | Fix error in email notification string formatting (diff) | |
| download | synapse-c71177f285fc21cef48912e138956a7b10f57f9e.tar.xz | |
Merge remote-tracking branch 'origin/dbkr/email_notif_string_fmt_error' into dbkr/email_unsubscribe
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/handlers/test_typing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index abb739ae52..ab9899b7d5 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -251,12 +251,12 @@ class TypingNotificationsTestCase(unittest.TestCase): # Gut-wrenching from synapse.handlers.typing import RoomMember - member = RoomMember(self.room_id, self.u_apple) + 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,)) + self.handler._room_typing[self.room_id] = set((self.u_apple.to_string(),)) self.assertEquals(self.event_source.get_current_key(), 0) |