diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
| commit | dc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch) | |
| tree | 22d02a68df93c3f98b0be7de8a07040268420369 /tests/federation/test_federation.py | |
| parent | Rename 'meta' to 'unsigned' (diff) | |
| parent | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff) | |
| download | synapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz | |
Merge branch 'develop' into event_signing
Conflicts: synapse/federation/replication.py
Diffstat (limited to 'tests/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py index eed50e6335..3a14c7c3b9 100644 --- a/tests/federation/test_federation.py +++ b/tests/federation/test_federation.py @@ -158,7 +158,7 @@ class FederationTestCase(unittest.TestCase): origin="red", destinations=["remote"], context="my-context", - ts=123456789002, + origin_server_ts=123456789002, pdu_type="m.test", content={"testing": "content here"}, depth=1, @@ -170,14 +170,14 @@ class FederationTestCase(unittest.TestCase): "remote", path="/_matrix/federation/v1/send/1000000/", data={ - "ts": 1000000, + "origin_server_ts": 1000000, "origin": "test", "pdus": [ { "origin": "red", "pdu_id": "abc123def456", "prev_pdus": [], - "ts": 123456789002, + "origin_server_ts": 123456789002, "context": "my-context", "pdu_type": "m.test", "is_state": False, @@ -209,7 +209,7 @@ class FederationTestCase(unittest.TestCase): path="/_matrix/federation/v1/send/1000000/", data={ "origin": "test", - "ts": 1000000, + "origin_server_ts": 1000000, "pdus": [], "edus": [ { @@ -236,7 +236,7 @@ class FederationTestCase(unittest.TestCase): "/_matrix/federation/v1/send/1001000/", """{ "origin": "remote", - "ts": 1001000, + "origin_server_ts": 1001000, "pdus": [], "edus": [ { |