diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
| commit | faee41c303c51f2d0ba9392643e67a8d100fbfa9 (patch) | |
| tree | a586ca2ca460de50eb37c301409ccd97f9f40abf /tests/federation/test_federation.py | |
| parent | Filter room where the user has been banned (diff) | |
| parent | Fix bug where we didn't always get 'prev_content' key (diff) | |
| download | synapse-faee41c303c51f2d0ba9392643e67a8d100fbfa9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation
Diffstat (limited to 'tests/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 9 |
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): |