diff options
| author | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-01-28 12:51:05 +0000 |
| commit | c291a4d522afef7449311673b3863db5e484b6e8 (patch) | |
| tree | f69458797cfba50c33448a7953e34f3527158154 /tests/rest/client/v1/test_profile.py | |
| parent | Reset badge count to zero when last active time is bumped (diff) | |
| parent | Initial cut of a shared base class for REST unit tests (diff) | |
| download | synapse-c291a4d522afef7449311673b3863db5e484b6e8.tar.xz | |
Merge branch 'develop' into pushers
Conflicts: synapse/handlers/events.py synapse/server.py
Diffstat (limited to 'tests/rest/client/v1/test_profile.py')
| -rw-r--r-- | tests/rest/client/v1/test_profile.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py index 47cfb10a6d..39cd68d829 100644 --- a/tests/rest/client/v1/test_profile.py +++ b/tests/rest/client/v1/test_profile.py @@ -24,6 +24,9 @@ from ....utils import MockHttpResource, MockKey from synapse.api.errors import SynapseError, AuthError from synapse.server import HomeServer +from synapse.types import UserID + +from synapse.rest.client.v1 import profile myid = "@1234ABCD:test" PATH_PREFIX = "/_matrix/client/api/v1" @@ -55,13 +58,13 @@ class ProfileTestCase(unittest.TestCase): ) def _get_user_by_req(request=None): - return hs.parse_userid(myid) + return UserID.from_string(myid) hs.get_auth().get_user_by_req = _get_user_by_req hs.get_handlers().profile_handler = self.mock_handler - hs.register_servlets() + profile.register_servlets(hs, self.mock_resource) @defer.inlineCallbacks def test_get_my_name(self): |