diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-17 10:29:23 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-17 10:29:23 +0000 |
| commit | 8c45c8b8b98c5a0e98bf4051994fed9847aadd08 (patch) | |
| tree | 12c7ac945749c68b81e3ae55c39dfd58ae824bf0 /tests/handlers/test_federation.py | |
| parent | Move getLastMessage to modelService. (diff) | |
| parent | Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects (diff) | |
| download | synapse-8c45c8b8b98c5a0e98bf4051994fed9847aadd08.tar.xz | |
Merge pull request #14 from matrix-org/merge_pdu_event_objects
Merge pdu and event objects
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 3f17ca8fb0..e19b073817 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -19,9 +19,10 @@ from tests import unittest from synapse.api.events.room import ( MessageEvent, ) + +from synapse.api.events import SynapseEvent from synapse.handlers.federation import FederationHandler from synapse.server import HomeServer -from synapse.federation.units import Pdu from mock import NonCallableMock, ANY, Mock @@ -74,7 +75,7 @@ class FederationTestCase(unittest.TestCase): @defer.inlineCallbacks def test_msg(self): - pdu = Pdu( + pdu = SynapseEvent( type=MessageEvent.TYPE, room_id="foo", content={"msgtype": u"fooo"}, |