summary refs log tree commit diff
path: root/tests/federation
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-15 15:05:12 +0100
committerErik Johnston <erik@matrix.org>2014-09-15 16:24:03 +0100
commit0897a09f49ea3e259acebe5ec630a06a6acfb08d (patch)
treeb1dfca65c6dc59f6b17ea444d12dafa86592a828 /tests/federation
parentFix 'age' key to update on retries (diff)
downloadsynapse-0897a09f49ea3e259acebe5ec630a06a6acfb08d.tar.xz
Fix unit tests after adding extra argument on put_json
Diffstat (limited to 'tests/federation')
-rw-r--r--tests/federation/test_federation.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py

index 954ccac2a4..bb17e9aafe 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py
@@ -17,7 +17,7 @@ from twisted.internet import defer from tests import unittest # python imports -from mock import Mock +from mock import Mock, ANY from ..utils import MockHttpResource, MockClock @@ -181,7 +181,8 @@ class FederationTestCase(unittest.TestCase): "depth": 1, }, ] - } + }, + on_send_callback=ANY, ) @defer.inlineCallbacks @@ -212,7 +213,9 @@ class FederationTestCase(unittest.TestCase): "content": {"testing": "content here"}, } ], - }) + }, + on_send_callback=ANY, + ) @defer.inlineCallbacks def test_recv_edu(self):