diff --git a/tests/utils.py b/tests/utils.py
index bb8e9964dd..60fd6085ac 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -76,6 +76,13 @@ class MockHttpResource(HttpServer):
mock_content.configure_mock(**config)
mock_request.content = mock_content
+ mock_request.method = http_method
+ mock_request.uri = path
+
+ mock_request.requestHeaders.getRawHeaders.return_value=[
+ "X-Matrix origin=test,key=,sig="
+ ]
+
# return the right path if the event requires it
mock_request.path = path
@@ -108,6 +115,21 @@ class MockHttpResource(HttpServer):
self.callbacks.append((method, path_pattern, callback))
+class MockKey(object):
+ alg = "mock_alg"
+ version = "mock_version"
+
+ @property
+ def verify_key(self):
+ return self
+
+ def sign(self, message):
+ return b"\x9a\x87$"
+
+ def verify(self, message, sig):
+ assert sig == b"\x9a\x87$"
+
+
class MockClock(object):
now = 1000
@@ -167,7 +189,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,6 +290,9 @@ class MemoryDataStore(object):
def get_ops_levels(self, room_id):
return defer.succeed((5, 5, 5))
+ def insert_client_ip(self, user, device_id, access_token, ip, user_agent):
+ return defer.succeed(None)
+
def _format_call(args, kwargs):
return ", ".join(
|
