diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-30 17:55:06 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-30 17:55:06 +0100 |
| commit | 9605593d11b67199a98ed25f121a2af2e1c9587a (patch) | |
| tree | dc57897bfcbd1591fa0dfb219e376353584654e9 /tests/rest/test_profile.py | |
| parent | SYN-75 Verify signatures on server to server transactions (diff) | |
| parent | pyflakes cleanup (diff) | |
| download | synapse-9605593d11b67199a98ed25f121a2af2e1c9587a.tar.xz | |
Merge branch 'develop' into server2server_signing
Conflicts: synapse/storage/__init__.py tests/rest/test_presence.py
Diffstat (limited to 'tests/rest/test_profile.py')
| -rw-r--r-- | tests/rest/test_profile.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/test_profile.py b/tests/rest/test_profile.py index e6e51f6dd0..b0f48e7fd8 100644 --- a/tests/rest/test_profile.py +++ b/tests/rest/test_profile.py @@ -50,10 +50,10 @@ class ProfileTestCase(unittest.TestCase): datastore=None, ) - def _get_user_by_token(token=None): + def _get_user_by_req(request=None): return hs.parse_userid(myid) - hs.get_auth().get_user_by_token = _get_user_by_token + hs.get_auth().get_user_by_req = _get_user_by_req hs.get_handlers().profile_handler = self.mock_handler |