diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 8d277d6612..933aa61c77 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,
@@ -207,10 +207,11 @@ class FederationTestCase(unittest.TestCase):
path="/_matrix/federation/v1/send/1000000/",
data={
"origin": "test",
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
+ # TODO: SYN-103: Remove "origin" and "destination"
"origin": "test",
"destination": "remote",
"edu_type": "m.test",
@@ -233,7 +234,7 @@ class FederationTestCase(unittest.TestCase):
"/_matrix/federation/v1/send/1001000/",
"""{
"origin": "remote",
- "ts": 1001000,
+ "origin_server_ts": 1001000,
"pdus": [],
"edus": [
{
diff --git a/tests/federation/test_pdu_codec.py b/tests/federation/test_pdu_codec.py
index 344e1baf60..0754ef92e8 100644
--- a/tests/federation/test_pdu_codec.py
+++ b/tests/federation/test_pdu_codec.py
@@ -68,7 +68,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.message",
origin="bar.com",
- ts=12345,
+ origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=False,
@@ -123,7 +123,7 @@ class PduCodecTestCase(unittest.TestCase):
context="rooooom",
pdu_type="m.room.topic",
origin="bar.com",
- ts=12345,
+ origin_server_ts=12345,
depth=5,
prev_pdus=[("alice", "bob.com")],
is_state=True,
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py
index 35c3a4df7b..219b2c4c5e 100644
--- a/tests/handlers/test_federation.py
+++ b/tests/handlers/test_federation.py
@@ -68,7 +68,7 @@ class FederationTestCase(unittest.TestCase):
pdu_type=MessageEvent.TYPE,
context="foo",
content={"msgtype": u"fooo"},
- ts=0,
+ origin_server_ts=0,
pdu_id="a",
origin="b",
)
@@ -95,7 +95,7 @@ class FederationTestCase(unittest.TestCase):
target_host=self.hostname,
context=room_id,
content={},
- ts=0,
+ origin_server_ts=0,
pdu_id="a",
origin="b",
)
@@ -127,7 +127,7 @@ class FederationTestCase(unittest.TestCase):
state_key="@red:not%s" % self.hostname,
context=room_id,
content={},
- ts=0,
+ origin_server_ts=0,
pdu_id="a",
origin="b",
)
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py
index 15022b8d05..1850deacf5 100644
--- a/tests/handlers/test_presence.py
+++ b/tests/handlers/test_presence.py
@@ -39,10 +39,11 @@ ONLINE = PresenceState.ONLINE
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
+ # TODO: SYN-103: Remove "origin" and "destination" keys.
"origin": origin,
"destination": destination,
"edu_type": edu_type,
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py
index 064b04c217..f1d3b27f74 100644
--- a/tests/handlers/test_typing.py
+++ b/tests/handlers/test_typing.py
@@ -29,10 +29,11 @@ from synapse.handlers.typing import TypingNotificationHandler
def _expect_edu(destination, edu_type, content, origin="test"):
return {
"origin": origin,
- "ts": 1000000,
+ "origin_server_ts": 1000000,
"pdus": [],
"edus": [
{
+ # TODO: SYN-103: Remove "origin" and "destination" keys.
"origin": origin,
"destination": destination,
"edu_type": edu_type,
diff --git a/tests/test_state.py b/tests/test_state.py
index b1624f0b25..4b1feaf410 100644
--- a/tests/test_state.py
+++ b/tests/test_state.py
@@ -599,7 +599,7 @@ def new_fake_pdu(pdu_id, context, pdu_type, state_key, prev_state_id,
prev_state_id=prev_state_id,
origin="example.com",
context="context",
- ts=1405353060021,
+ origin_server_ts=1405353060021,
depth=depth,
content_json="{}",
unrecognized_keys="{}",
|
