summary refs log tree commit diff
path: root/tests/rest/client
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 15:54:54 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 15:54:54 +0000
commit33391db5f8d9d0d365607ca50ba59ce72c90cda0 (patch)
tree14761c702a42eda754b04a53dbed4d73f47082c8 /tests/rest/client
parentMerge changes from develop (diff)
downloadsynapse-33391db5f8d9d0d365607ca50ba59ce72c90cda0.tar.xz
Merge in auth changes from develop
Diffstat (limited to 'tests/rest/client')
-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