summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-25 16:29:39 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-25 16:29:39 +0100
commita9d8bd95e722e24c7ddd6b14a3714c1b2f737d4d (patch)
tree693d21429ea9258891c117d8c02694f4dfc36d1e /tests/rest
parentRe-wrap line (diff)
downloadsynapse-a9d8bd95e722e24c7ddd6b14a3714c1b2f737d4d.tar.xz
Stop looking up "admin", which we never read
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/client/v1/test_presence.py2
-rw-r--r--tests/rest/client/v1/test_rooms.py7
-rw-r--r--tests/rest/client/v1/test_typing.py1
-rw-r--r--tests/rest/client/v2_alpha/__init__.py1
4 files changed, 0 insertions, 11 deletions
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py
index 4039a86d85..91547bdd06 100644
--- a/tests/rest/client/v1/test_presence.py
+++ b/tests/rest/client/v1/test_presence.py
@@ -73,7 +73,6 @@ class PresenceStateTestCase(unittest.TestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(myid),
-                "admin": False,
                 "token_id": 1,
             }
 
@@ -161,7 +160,6 @@ class PresenceListTestCase(unittest.TestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(myid),
-                "admin": False,
                 "token_id": 1,
             }
 
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index dd1e67e0f9..34ab47d02e 100644
--- a/tests/rest/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -57,7 +57,6 @@ class RoomPermissionsTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -443,7 +442,6 @@ class RoomsMemberListTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -522,7 +520,6 @@ class RoomsCreateTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -614,7 +611,6 @@ class RoomTopicTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
 
@@ -720,7 +716,6 @@ class RoomMemberStateTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -846,7 +841,6 @@ class RoomMessagesTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
@@ -942,7 +936,6 @@ class RoomInitialSyncTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_v1auth().get_user_by_access_token = _get_user_by_access_token
diff --git a/tests/rest/client/v1/test_typing.py b/tests/rest/client/v1/test_typing.py
index 0f70ce81dc..1c4519406d 100644
--- a/tests/rest/client/v1/test_typing.py
+++ b/tests/rest/client/v1/test_typing.py
@@ -64,7 +64,6 @@ class RoomTypingTestCase(RestTestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.auth_user_id),
-                "admin": False,
                 "token_id": 1,
             }
 
diff --git a/tests/rest/client/v2_alpha/__init__.py b/tests/rest/client/v2_alpha/__init__.py
index badb59f080..ef972a53aa 100644
--- a/tests/rest/client/v2_alpha/__init__.py
+++ b/tests/rest/client/v2_alpha/__init__.py
@@ -46,7 +46,6 @@ class V2AlphaRestTestCase(unittest.TestCase):
         def _get_user_by_access_token(token=None):
             return {
                 "user": UserID.from_string(self.USER_ID),
-                "admin": False,
                 "token_id": 1,
             }
         hs.get_auth().get_user_by_access_token = _get_user_by_access_token