summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-27 11:58:32 +0000
committerErik Johnston <erik@matrix.org>2014-10-27 11:58:32 +0000
commitad9226eeec87f1e5e3886c4dd599f89e7577d5a5 (patch)
tree602250011e5528be426aa8965164e707ea978cbc /tests/utils.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into federation_autho... (diff)
parentfix pyflakes warnings (diff)
downloadsynapse-ad9226eeec87f1e5e3886c4dd599f89e7577d5a5.tar.xz
Merge branch 'event_signing' of github.com:matrix-org/synapse into federation_authorization
Conflicts:
	synapse/storage/__init__.py
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 60fd6085ac..d8be73dba8 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -118,13 +118,14 @@ class MockHttpResource(HttpServer):
 class MockKey(object):
     alg = "mock_alg"
     version = "mock_version"
+    signature = b"\x9a\x87$"
 
     @property
     def verify_key(self):
         return self
 
     def sign(self, message):
-        return b"\x9a\x87$"
+        return self
 
     def verify(self, message, sig):
         assert sig == b"\x9a\x87$"