diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:36:21 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-01-28 15:43:41 +0000 |
| commit | c59bcabf0b5c0ab78c0f89da75b031993c4660d9 (patch) | |
| tree | 5691f2b6cc16fb0435c78925004bc12392fa3a42 /tests/rest/client/v1 | |
| parent | Merge pull request #34 from matrix-org/remove_serialize_event_from_hs (diff) | |
| download | synapse-c59bcabf0b5c0ab78c0f89da75b031993c4660d9.tar.xz | |
Return the device_id from get_auth_by_req
Diffstat (limited to 'tests/rest/client/v1')
| -rw-r--r-- | tests/rest/client/v1/test_presence.py | 2 | ||||
| -rw-r--r-- | tests/rest/client/v1/test_profile.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py index 65d5cc4916..a4f2abf213 100644 --- a/tests/rest/client/v1/test_presence.py +++ b/tests/rest/client/v1/test_presence.py @@ -282,7 +282,7 @@ class PresenceEventStreamTestCase(unittest.TestCase): hs.get_clock().time_msec.return_value = 1000000 def _get_user_by_req(req=None): - return UserID.from_string(myid) + return (UserID.from_string(myid), "") hs.get_auth().get_user_by_req = _get_user_by_req diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py index 39cd68d829..6a2085276a 100644 --- a/tests/rest/client/v1/test_profile.py +++ b/tests/rest/client/v1/test_profile.py @@ -58,7 +58,7 @@ class ProfileTestCase(unittest.TestCase): ) def _get_user_by_req(request=None): - return UserID.from_string(myid) + return (UserID.from_string(myid), "") hs.get_auth().get_user_by_req = _get_user_by_req |