summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-29 15:35:57 +0100
committerErik Johnston <erik@matrix.org>2014-09-29 15:35:57 +0100
commitd96cb61f26fa5ed3f0aab9b4c461e9656d986194 (patch)
tree279d3b8efd4c9ec32d55703cee8b659f4792fa10 /tests/utils.py
parentUpdate docstring (diff)
downloadsynapse-d96cb61f26fa5ed3f0aab9b4c461e9656d986194.tar.xz
Unbreak tests after changing storage API
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py
index ae97621147..e7c4bc4cad 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -167,7 +167,11 @@ class MemoryDataStore(object):
 
     def get_user_by_token(self, token):
         try:
-            return self.tokens_to_users[token]
+            return {
+                "name": self.tokens_to_users[token],
+                "admin": 0,
+                "device_id": None,
+            }
         except:
             raise StoreError(400, "User does not exist.")
 
@@ -264,7 +268,7 @@ class MemoryDataStore(object):
     def get_ops_levels(self, room_id):
         return defer.succeed((5, 5, 5))
 
-    def insert_client_ip(self, user, access_token, ip_addr):
+    def insert_client_ip(self, user, device_id, access_token, ip, user_agent):
         return defer.succeed(None)