diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-12-16 13:53:43 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-12-16 13:53:43 +0000 |
| commit | 2af40cfa14ba579c156349ae3457a55bc93f8548 (patch) | |
| tree | 2b94b53c72d51fc170549213ed8cb88556c2b501 /tests/federation/test_federation.py | |
| parent | Add a script for talking matrix federation adding X-Matrix Authorization (diff) | |
| parent | Fix pyflakes (diff) | |
| download | synapse-2af40cfa14ba579c156349ae3457a55bc93f8548.tar.xz | |
Merge pull request #25 from matrix-org/events_refactor
Event refactor
Diffstat (limited to 'tests/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index f6b41e2c4c..79ac1ce10d 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -23,25 +23,20 @@ from ..utils import MockHttpResource, MockClock, MockKey from synapse.server import HomeServer from synapse.federation import initialize_http_replication -from synapse.api.events import SynapseEvent +from synapse.events import FrozenEvent from synapse.storage.transactions import DestinationsTable + def make_pdu(prev_pdus=[], **kwargs): """Provide some default fields for making a PduTuple.""" pdu_fields = { - "is_state": False, - "unrecognized_keys": [], - "outlier": False, - "have_processed": True, "state_key": None, - "power_level": None, - "prev_state_id": None, - "prev_state_origin": None, + "prev_events": prev_pdus, } pdu_fields.update(kwargs) - return SynapseEvent(prev_pdus=prev_pdus, **pdu_fields) + return FrozenEvent(pdu_fields) class FederationTestCase(unittest.TestCase): @@ -176,7 +171,7 @@ class FederationTestCase(unittest.TestCase): (200, "OK") ) - pdu = SynapseEvent( + pdu = make_pdu( event_id="abc123def456", origin="red", user_id="@a:red", @@ -185,10 +180,9 @@ class FederationTestCase(unittest.TestCase): origin_server_ts=123456789001, depth=1, content={"text": "Here is the message"}, - destinations=["remote"], ) - yield self.federation.send_pdu(pdu) + yield self.federation.send_pdu(pdu, ["remote"]) self.mock_http_client.put_json.assert_called_with( "remote", |