diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-02 13:39:22 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-02 13:39:22 +0000 |
| commit | 4195e55ccc0f5751b13136b8c5f60686a902b79d (patch) | |
| tree | d9e1596e1ecf6cfd6a3e7152a20748496a9e0890 /tests/rest | |
| parent | Use contextlib.contextmanager instead of a custom class (diff) | |
| parent | Merge pull request #95 from matrix-org/serialize_transaction_processing (diff) | |
| download | synapse-4195e55ccc0f5751b13136b8c5f60686a902b79d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_rate_limit
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/client/v1/test_presence.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index 7c5df5c116..5f2ef64efc 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -295,6 +295,9 @@ class PresenceEventStreamTestCase(unittest.TestCase): self.mock_datastore = hs.get_datastore() self.mock_datastore.get_app_service_by_token = Mock(return_value=None) + self.mock_datastore.get_app_service_by_user_id = Mock( + return_value=defer.succeed(None) + ) def get_profile_displayname(user_id): return defer.succeed("Frank") |