diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:01:29 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:01:29 +0100 |
| commit | 13a6517d89c0619a938321640f331571eba0edc9 (patch) | |
| tree | 015269fdca734b7224f226a3abb5f42dcca9dadb /tests/rest/client/v1/test_presence.py | |
| parent | Move token generation to auth handler (diff) | |
| download | synapse-13a6517d89c0619a938321640f331571eba0edc9.tar.xz | |
s/by_token/by_access_token/g
We're about to have two kinds of token, access and refresh
Diffstat (limited to 'tests/rest/client/v1/test_presence.py')
| -rw-r--r-- | tests/rest/client/v1/test_presence.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index 089a71568c..0b78a82a66 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -70,7 +70,7 @@ class PresenceStateTestCase(unittest.TestCase): return defer.succeed([]) self.datastore.get_presence_list = get_presence_list - def _get_user_by_token(token=None): + def _get_user_by_access_token(token=None): return { "user": UserID.from_string(myid), "admin": False, @@ -78,7 +78,7 @@ class PresenceStateTestCase(unittest.TestCase): "token_id": 1, } - hs.get_v1auth().get_user_by_token = _get_user_by_token + hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token room_member_handler = hs.handlers.room_member_handler = Mock( spec=[ @@ -159,7 +159,7 @@ class PresenceListTestCase(unittest.TestCase): ) self.datastore.has_presence_state = has_presence_state - def _get_user_by_token(token=None): + def _get_user_by_access_token(token=None): return { "user": UserID.from_string(myid), "admin": False, @@ -173,7 +173,7 @@ class PresenceListTestCase(unittest.TestCase): ] ) - hs.get_v1auth().get_user_by_token = _get_user_by_token + hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token presence.register_servlets(hs, self.mock_resource) |