diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-17 17:33:58 +0100 |
commit | dc3c2823ac425c9b5bbe6883b7d33a12059a08fb (patch) | |
tree | 22d02a68df93c3f98b0be7de8a07040268420369 /tests/test_state.py | |
parent | Rename 'meta' to 'unsigned' (diff) | |
parent | keep 'origin_server_ts' as 'ts' in the database to avoid needlessly updating ... (diff) | |
download | synapse-dc3c2823ac425c9b5bbe6883b7d33a12059a08fb.tar.xz |
Merge branch 'develop' into event_signing
Conflicts: synapse/federation/replication.py
Diffstat (limited to 'tests/test_state.py')
-rw-r--r-- | tests/test_state.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_state.py b/tests/test_state.py index b1624f0b25..4b1feaf410 100644 --- a/tests/test_state.py +++ b/tests/test_state.py @@ -599,7 +599,7 @@ def new_fake_pdu(pdu_id, context, pdu_type, state_key, prev_state_id, prev_state_id=prev_state_id, origin="example.com", context="context", - ts=1405353060021, + origin_server_ts=1405353060021, depth=depth, content_json="{}", unrecognized_keys="{}", |