summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-13 14:37:46 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-13 14:37:46 +0100
commit66848557672977e17f0d5ba785b7567b305ccdbe (patch)
tree0a0bee24bf0dd81559744d13e84eace9fa335972 /tests
parentSYN-75 sign at the request level rather than the transaction level (diff)
downloadsynapse-66848557672977e17f0d5ba785b7567b305ccdbe.tar.xz
Verify signatures for server2server requests
Diffstat (limited to '')
-rw-r--r--tests/federation/test_federation.py1
-rw-r--r--tests/utils.py3
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 91edeaa4b9..8d277d6612 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -221,6 +221,7 @@ class FederationTestCase(unittest.TestCase):
                 json_data_callback=ANY,
         )
 
+
     @defer.inlineCallbacks
     def test_recv_edu(self):
         recv_observer = Mock()
diff --git a/tests/utils.py b/tests/utils.py
index 797818be72..83dbd4f4d3 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -76,6 +76,9 @@ class MockHttpResource(HttpServer):
         mock_content.configure_mock(**config)
         mock_request.content = mock_content
 
+        mock_request.method = http_method
+        mock_request.uri = path
+
         # return the right path if the event requires it
         mock_request.path = path