summary refs log tree commit diff
path: root/tests/federation
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:31:48 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:31:48 +0100
commit82c582076782f180c9f69a523953c3a36b57b3ac (patch)
tree00a79bdfe56a139cbe427ecc28bad852bdc3663d /tests/federation
parentSPEC-7: Rename 'ts' to 'origin_server_ts' (diff)
downloadsynapse-82c582076782f180c9f69a523953c3a36b57b3ac.tar.xz
keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating schema
Diffstat (limited to 'tests/federation')
-rw-r--r--tests/federation/test_federation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index 8b1202f6e4..933aa61c77 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -99,7 +99,7 @@ class FederationTestCase(unittest.TestCase):
                     origin="red",
                     context="my-context",
                     pdu_type="m.topic",
-                    origin_server_ts=123456789000,
+                    ts=123456789000,
                     depth=1,
                     is_state=True,
                     content_json='{"topic":"The topic"}',
@@ -134,7 +134,7 @@ class FederationTestCase(unittest.TestCase):
                     origin="red",
                     context="my-context",
                     pdu_type="m.text",
-                    origin_server_ts=123456789001,
+                    ts=123456789001,
                     depth=1,
                     content_json='{"text":"Here is the message"}',
                 )