diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:15:07 +0000 |
| commit | c02da58a9da5c617c80fbeb7205f163e7b410c6f (patch) | |
| tree | 8b166570eb2cbbecb7640d92d072f31add922535 /tests/rest/client | |
| parent | Consume errors in time_bound_deferred (diff) | |
| parent | Merge pull request #74 from matrix-org/federation_min_depth_fix (diff) | |
| download | synapse-c02da58a9da5c617c80fbeb7205f163e7b410c6f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into failures
Diffstat (limited to 'tests/rest/client')
| -rw-r--r-- | tests/rest/client/v1/test_presence.py | 3 | ||||
| -rw-r--r-- | tests/rest/client/v2_alpha/__init__.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index c1acba5a09..7c5df5c116 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -61,6 +61,7 @@ class PresenceStateTestCase(unittest.TestCase): hs.handlers = JustPresenceHandlers(hs) self.datastore = hs.get_datastore() + self.datastore.get_app_service_by_token = Mock(return_value=None) def get_presence_list(*a, **kw): return defer.succeed([]) @@ -147,6 +148,7 @@ class PresenceListTestCase(unittest.TestCase): hs.handlers = JustPresenceHandlers(hs) self.datastore = hs.get_datastore() + self.datastore.get_app_service_by_token = Mock(return_value=None) def has_presence_state(user_localpart): return defer.succeed( @@ -292,6 +294,7 @@ class PresenceEventStreamTestCase(unittest.TestCase): hs.handlers.room_member_handler.get_rooms_for_user = get_rooms_for_user self.mock_datastore = hs.get_datastore() + self.mock_datastore.get_app_service_by_token = Mock(return_value=None) def get_profile_displayname(user_id): return defer.succeed("Frank") diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py index f5a5f780b4..de5a917e6a 100644 --- a/tests/rest/client/v2_alpha/__init__.py +++ b/tests/rest/client/v2_alpha/__init__.py @@ -56,6 +56,8 @@ class V2AlphaRestTestCase(unittest.TestCase): r.register_servlets(hs, self.mock_resource) def make_datastore_mock(self): - return Mock(spec=[ + store = Mock(spec=[ "insert_client_ip", ]) + store.get_app_service_by_token = Mock(return_value=None) + return store |