diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
| commit | 9970f955ce1ab36d21f7824d9f1382ab1df778e5 (patch) | |
| tree | 94f824e633ac9b9fab18171a67a6b94aec2839a9 /tests/handlers | |
| parent | Newsfile (diff) | |
| parent | Fix races in room stats (and other) updates. (#6187) (diff) | |
| download | synapse-9970f955ce1ab36d21f7824d9f1382ab1df778e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_typing.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index 1f2ef5d01f..67f1013051 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -139,7 +139,7 @@ class TypingNotificationsTestCase(unittest.HomeserverTestCase): defer.succeed(1) ) - self.datastore.get_current_state_deltas.return_value = None + self.datastore.get_current_state_deltas.return_value = (0, None) self.datastore.get_to_device_stream_token = lambda: 0 self.datastore.get_new_device_msgs_for_remote = lambda *args, **kargs: ([], 0) |