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/storage | |
| 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/storage')
| -rw-r--r-- | tests/storage/test_event_federation.py | 2 | ||||
| -rw-r--r-- | tests/storage/test_state.py | 2 |
2 files changed, 2 insertions, 2 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) diff --git a/tests/storage/test_state.py b/tests/storage/test_state.py index 7a76d67b8c..f7871cd426 100644 --- a/tests/storage/test_state.py +++ b/tests/storage/test_state.py @@ -176,7 +176,7 @@ class StateStoreTestCase(tests.unittest.TestCase): room_id = self.room.to_string() group_ids = yield self.store.get_state_groups_ids(room_id, [e5.event_id]) - group = group_ids.keys()[0] + group = list(group_ids.keys())[0] # test _get_some_state_from_cache correctly filters out members with types=[] (state_dict, is_all) = yield self.store._get_some_state_from_cache( |