summary refs log tree commit diff
path: root/tests/rest/test_profile.py
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-09-29 18:37:28 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-09-29 18:37:28 +0100
commitdca75a08ba5e64554f22813bd0a0356760a1be25 (patch)
treecb28d1e16cc825d4b88bc814e9e6ea1b34783f15 /tests/rest/test_profile.py
parentExtended docs about the registration/login flows (diff)
parentAdd a 'Redactions' section. (diff)
downloadsynapse-dca75a08ba5e64554f22813bd0a0356760a1be25.tar.xz
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'tests/rest/test_profile.py')
-rw-r--r--tests/rest/test_profile.py4
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