diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-17 18:27:47 +0100 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-09-17 18:27:47 +0100 |
| commit | 4571cf7baadf360e27e05a73142571da9f165d47 (patch) | |
| tree | ed5850f285a35df2353b3562ed4bca1fd34d5324 /tests/federation | |
| parent | Remark on remaining storage modules that still need unit tests (diff) | |
| parent | WEB-35: joins/parts should trigger desktop notifications (diff) | |
| download | synapse-4571cf7baadf360e27e05a73142571da9f165d47.tar.xz | |
Merge branch 'develop' into test-sqlite-memory
Diffstat (limited to 'tests/federation')
| -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): |