summary refs log tree commit diff
path: root/tests/federation/test_federation.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-11 17:11:06 +0000
committerErik Johnston <erik@matrix.org>2014-12-11 17:11:06 +0000
commit3fecacd86b32ab8d5a2b16bc124167227eb8dcb7 (patch)
treebcf3f45bfa6a61287958f5238a0ce795aed8e215 /tests/federation/test_federation.py
parentFix federation test (diff)
downloadsynapse-3fecacd86b32ab8d5a2b16bc124167227eb8dcb7.tar.xz
Fix replication tests
Diffstat (limited to 'tests/federation/test_federation.py')
-rw-r--r--tests/federation/test_federation.py18
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",