From 82c582076782f180c9f69a523953c3a36b57b3ac Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 17 Oct 2014 17:31:48 +0100
Subject: keep 'origin_server_ts' as 'ts' in the database to avoid needlessly
 updating schema

---
 tests/federation/test_federation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

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"}',
                 )
-- 
cgit 1.4.1