diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-05 14:41:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-05 14:41:07 +0100 |
| commit | e779ee0ee21584b8907b866734376a737a8b6d2e (patch) | |
| tree | cc27f059a354379346f9a21ff6b8b661a9407b65 /tests/rest | |
| parent | Merge branch 'release-v0.18.0' of github.com:matrix-org/synapse (diff) | |
| parent | Bump changelog and version (diff) | |
| download | synapse-e779ee0ee21584b8907b866734376a737a8b6d2e.tar.xz | |
Merge branch 'release-v0.18.1' of github.com:matrix-org/synapse v0.18.1
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/client/v1/test_typing.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/rest/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py index 467f253ef6..a269e6f56e 100644 --- a/tests/rest/client/v1/test_typing.py +++ b/tests/rest/client/v1/test_typing.py @@ -105,9 +105,6 @@ class RoomTypingTestCase(RestTestCase): # Need another user to make notifications actually work yield self.join(self.room_id, user="@jim:red") - def tearDown(self): - self.hs.get_typing_handler().tearDown() - @defer.inlineCallbacks def test_set_typing(self): (code, _) = yield self.mock_resource.trigger( @@ -147,7 +144,7 @@ class RoomTypingTestCase(RestTestCase): self.assertEquals(self.event_source.get_current_key(), 1) - self.clock.advance_time(31) + self.clock.advance_time(36) self.assertEquals(self.event_source.get_current_key(), 2) |