diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-27 10:20:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-27 10:20:44 +0000 |
| commit | bb4a20174cb9128a1d9d5b7bd3d11d98b070edb6 (patch) | |
| tree | f7ea571aedd4f1c8ae74a7c9ba3356a6c2107351 /tests/handlers/test_federation.py | |
| parent | It doesn't want a dict (diff) | |
| parent | Add log message if we can't enable ECC. Require pyopenssl>=0.14 since 0.13 do... (diff) | |
| download | synapse-bb4a20174cb9128a1d9d5b7bd3d11d98b070edb6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into federation_authorization
Conflicts: synapse/federation/transport.py synapse/handlers/message.py
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 6 |
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", ) |