summary refs log tree commit diff
path: root/tests/handlers/test_federation.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-17 17:12:25 +0100
committerMark Haines <mark.haines@matrix.org>2014-10-17 17:12:25 +0100
commitf5cf7ac25b311fda8a2d553f07437b3648c66f6c (patch)
tree62d43c8acf91281f59239f331745e9796a0f827e /tests/handlers/test_federation.py
parentSPEC-7: Don't stamp event contents with 'hsob_ts' (diff)
downloadsynapse-f5cf7ac25b311fda8a2d553f07437b3648c66f6c.tar.xz
SPEC-7: Rename 'ts' to 'origin_server_ts'
Diffstat (limited to 'tests/handlers/test_federation.py')
-rw-r--r--tests/handlers/test_federation.py6
1 files changed, 3 insertions, 3 deletions
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", )