diff options
| author | Neil Johnson <neil@matrix.org> | 2018-08-09 11:40:37 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2018-08-09 11:40:37 +0100 |
| commit | a5ef1107490a8f581e8baf8a29d509826b8d2490 (patch) | |
| tree | 24dcb2ae7813a421d04b6faa3a00c8ec646a7bef /tests/handlers | |
| parent | sync auth blocking (diff) | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-a5ef1107490a8f581e8baf8a29d509826b8d2490.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_typing.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/handlers/test_typing.py b/tests/handlers/test_typing.py index 2c263af1a3..f422cf3c5a 100644 --- a/tests/handlers/test_typing.py +++ b/tests/handlers/test_typing.py @@ -48,7 +48,9 @@ def _expect_edu(destination, edu_type, content, origin="test"): def _make_edu_json(origin, edu_type, content): - return json.dumps(_expect_edu("test", edu_type, content, origin=origin)) + return json.dumps( + _expect_edu("test", edu_type, content, origin=origin) + ).encode('utf8') class TypingNotificationsTestCase(unittest.TestCase): |