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/federation/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/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index ad09fab392..efac4075dc 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -23,7 +23,7 @@ from ..utils import MockHttpResource, MockClock, MockKey from synapse.server import HomeServer from synapse.federation import initialize_http_replication -from synapse.federation.units import Pdu +from synapse.api.events import SynapseEvent def make_pdu(prev_pdus=[], **kwargs): @@ -40,7 +40,7 @@ def make_pdu(prev_pdus=[], **kwargs): } pdu_fields.update(kwargs) - return Pdu(prev_pdus=prev_pdus, **pdu_fields) + return SynapseEvent(prev_pdus=prev_pdus, **pdu_fields) class FederationTestCase(unittest.TestCase): @@ -169,7 +169,7 @@ class FederationTestCase(unittest.TestCase): (200, "OK") ) - pdu = Pdu( + pdu = SynapseEvent( event_id="abc123def456", origin="red", room_id="my-context", @@ -189,7 +189,7 @@ class FederationTestCase(unittest.TestCase): "origin_server_ts": 1000000, "origin": "test", "pdus": [ - pdu.get_dict(), + pdu.get_pdu_json(), ], 'pdu_failures': [], }, |