diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-09-22 18:54:00 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-09-22 18:54:00 +0100 |
| commit | 09d79b0a9bf7a194383830d2e55530c70f2366b6 (patch) | |
| tree | 76573bac3ca48deeca6cd33f91ed2ee3408dffb2 /tests/handlers/test_federation.py | |
| parent | SYN-39: Add documentation explaining how to check a signature (diff) | |
| parent | Show display name changes in the message list. (diff) | |
| download | synapse-09d79b0a9bf7a194383830d2e55530c70f2366b6.tar.xz | |
Merge branch 'develop' into server2server_signing
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 6fc3d8f7fd..eb6b7c22ef 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -14,7 +14,7 @@ from twisted.internet import defer -from twisted.trial import unittest +from tests import unittest from synapse.api.events.room import ( InviteJoinEvent, MessageEvent, RoomMemberEvent @@ -26,12 +26,8 @@ from synapse.federation.units import Pdu from mock import NonCallableMock, ANY -import logging - from ..utils import get_mock_call_args -logging.getLogger().addHandler(logging.NullHandler()) - class FederationTestCase(unittest.TestCase): @@ -78,7 +74,9 @@ class FederationTestCase(unittest.TestCase): yield self.handlers.federation_handler.on_receive_pdu(pdu, False) - self.datastore.persist_event.assert_called_once_with(ANY, False) + self.datastore.persist_event.assert_called_once_with( + ANY, False, is_new_state=False + ) self.notifier.on_new_room_event.assert_called_once_with(ANY) @defer.inlineCallbacks |