summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 15:55:58 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 15:55:58 +0000
commitcf7c54ec93a733ab8d46d60f907e57ca1cec602f (patch)
treeb6e09bc7b23982501cb49bb3817413a29ffd4600 /tests/rest
parentMerge branch 'client_v2_filter' into client_v2_sync (diff)
parentMerge in auth changes from develop (diff)
downloadsynapse-cf7c54ec93a733ab8d46d60f907e57ca1cec602f.tar.xz
Merge branch 'client_v2_filter' into client_v2_sync
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/client/v2_alpha/__init__.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py
index 3fe62d5ac6..fa70575c57 100644
--- a/tests/rest/client/v2_alpha/__init__.py
+++ b/tests/rest/client/v2_alpha/__init__.py
@@ -51,6 +51,7 @@ class V2AlphaRestTestCase(unittest.TestCase):
                 "user": UserID.from_string(self.USER_ID),
                 "admin": False,
                 "device_id": None,
+                "token_id": 1,
             }
         hs.get_auth().get_user_by_token = _get_user_by_token