summary refs log tree commit diff
path: root/tests/storage/test_event_federation.py
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-09 11:40:37 +0100
committerNeil Johnson <neil@matrix.org>2018-08-09 11:40:37 +0100
commita5ef1107490a8f581e8baf8a29d509826b8d2490 (patch)
tree24dcb2ae7813a421d04b6faa3a00c8ec646a7bef /tests/storage/test_event_federation.py
parentsync auth blocking (diff)
parentMerge branch 'master' into develop (diff)
downloadsynapse-a5ef1107490a8f581e8baf8a29d509826b8d2490.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_sync_block
Diffstat (limited to 'tests/storage/test_event_federation.py')
-rw-r--r--tests/storage/test_event_federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test_event_federation.py b/tests/storage/test_event_federation.py

index 30683e7888..69412c5aad 100644 --- a/tests/storage/test_event_federation.py +++ b/tests/storage/test_event_federation.py
@@ -49,7 +49,7 @@ class EventFederationWorkerStoreTestCase(tests.unittest.TestCase): 'INSERT INTO event_reference_hashes ' '(event_id, algorithm, hash) ' "VALUES (?, 'sha256', ?)" - ), (event_id, 'ffff')) + ), (event_id, b'ffff')) for i in range(0, 11): yield self.store.runInteraction("insert", insert_event, i)