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_typing.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_typing.py')
| -rw-r--r-- | tests/handlers/test_typing.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index 064b04c217..f1d3b27f74 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -29,10 +29,11 @@ from synapse.handlers.typing import TypingNotificationHandler def _expect_edu(destination, edu_type, content, origin="test"): return { "origin": origin, - "ts": 1000000, + "origin_server_ts": 1000000, "pdus": [], "edus": [ { + # TODO: SYN-103: Remove "origin" and "destination" keys. "origin": origin, "destination": destination, "edu_type": edu_type, |