diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 13:05:07 +0100 |
| commit | 704e7e9f44bb6ac4de03e47fd9276396d3c00af9 (patch) | |
| tree | 2b3f49347cb9615bdacf276a8b786243aa16d324 /tests/handlers/test_federation.py | |
| parent | freenode verification (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.3.0 (diff) | |
| download | synapse-704e7e9f44bb6ac4de03e47fd9276396d3c00af9.tar.xz | |
Merge branch 'release-v0.3.0' of github.com:matrix-org/synapse v0.3.0
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 |