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/federation/test_pdu_codec.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/federation/test_pdu_codec.py')
-rw-r--r-- | tests/federation/test_pdu_codec.py | 4 |
1 files changed, 2 insertions, 2 deletions
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, |