diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-28 13:39:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-28 13:39:42 +0100 |
| commit | 327ca883ec51780ea2a914d3c89ca0499f4656ac (patch) | |
| tree | dc3f2c06cdbbfce8b1d1bb6a4db31a8852f5b43a /tests/rest/client/v1/test_presence.py | |
| parent | Quickly fix dodgy est. time remaining (diff) | |
| parent | Merge pull request #126 from matrix-org/csauth (diff) | |
| download | synapse-327ca883ec51780ea2a914d3c89ca0499f4656ac.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to 'tests/rest/client/v1/test_presence.py')
| -rw-r--r-- | tests/rest/client/v1/test_presence.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index b9c03383a2..8e0c5fa630 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -75,7 +75,7 @@ class PresenceStateTestCase(unittest.TestCase): "token_id": 1, } - hs.get_auth().get_user_by_token = _get_user_by_token + hs.get_v1auth().get_user_by_token = _get_user_by_token room_member_handler = hs.handlers.room_member_handler = Mock( spec=[ @@ -170,7 +170,7 @@ class PresenceListTestCase(unittest.TestCase): ] ) - hs.get_auth().get_user_by_token = _get_user_by_token + hs.get_v1auth().get_user_by_token = _get_user_by_token presence.register_servlets(hs, self.mock_resource) @@ -277,7 +277,7 @@ class PresenceEventStreamTestCase(unittest.TestCase): def _get_user_by_req(req=None): return (UserID.from_string(myid), "") - hs.get_auth().get_user_by_req = _get_user_by_req + hs.get_v1auth().get_user_by_req = _get_user_by_req presence.register_servlets(hs, self.mock_resource) events.register_servlets(hs, self.mock_resource) |