diff options
| author | Erik Johnston <erik@matrix.org> | 2017-01-25 14:27:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-01-25 14:27:27 +0000 |
| commit | 2367c5568c01bc65aacc955b76ba707918b37f1e (patch) | |
| tree | 0f07606420d5f64ba3e186ce69876fc6301082a3 /tests | |
| parent | Merge branch 'erikj/current_state_fix' into develop (diff) | |
| download | synapse-2367c5568c01bc65aacc955b76ba707918b37f1e.tar.xz | |
Add basic implementation of local device list changes
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/handlers/test_typing.py | 3 | ||||
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index c718d1f98f..f88d2be7c5 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -75,6 +75,7 @@ class TypingNotificationsTestCase(unittest.TestCase): "get_received_txn_response", "set_received_txn_response", "get_destination_retry_timings", + "get_devices_by_remote", ]), state_handler=self.state_handler, handlers=None, @@ -99,6 +100,8 @@ class TypingNotificationsTestCase(unittest.TestCase): defer.succeed(retry_timings_res) ) + self.datastore.get_devices_by_remote.return_value = (0, []) + def get_received_txn_response(*args): return defer.succeed(None) self.datastore.get_received_txn_response = get_received_txn_response diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index 6bce352c5f..d746ea8568 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -1032,7 +1032,7 @@ class RoomMessageListTestCase(RestTestCase): @defer.inlineCallbacks def test_topo_token_is_accepted(self): - token = "t1-0_0_0_0_0_0_0" + token = "t1-0_0_0_0_0_0_0_0" (code, response) = yield self.mock_resource.trigger_get( "/rooms/%s/messages?access_token=x&from=%s" % (self.room_id, token)) @@ -1044,7 +1044,7 @@ class RoomMessageListTestCase(RestTestCase): @defer.inlineCallbacks def test_stream_token_is_accepted_for_fwd_pagianation(self): - token = "s0_0_0_0_0_0_0" + token = "s0_0_0_0_0_0_0_0" (code, response) = yield self.mock_resource.trigger_get( "/rooms/%s/messages?access_token=x&from=%s" % (self.room_id, token)) |