OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

flake8

pull/3757/head
Matthew Hodgson 2017-12-31 17:50:55 +00:00 committed by Hubert Chathi
parent fe87890b18
commit edc427a351
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/storage/e2e_room_keys.py
View File

@ -136,7 +136,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
desc="get_e2e_room_keys", desc="get_e2e_room_keys",
) )
sessions = { 'rooms': {} } sessions = {'rooms': {}}
for row in rows: for row in rows:
room_entry = sessions['rooms'].setdefault(row['room_id'], {"sessions": {}}) room_entry = sessions['rooms'].setdefault(row['room_id'], {"sessions": {}})
room_entry['sessions'][row['session_id']] = { room_entry['sessions'][row['session_id']] = {

21
tests/handlers/test_e2e_room_keys.py
View File

@ -42,6 +42,7 @@ room_keys = {
} }
} }
class E2eRoomKeysHandlerTestCase(unittest.TestCase): class E2eRoomKeysHandlerTestCase(unittest.TestCase):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(E2eRoomKeysHandlerTestCase, self).__init__(*args, **kwargs) super(E2eRoomKeysHandlerTestCase, self).__init__(*args, **kwargs)
@ -55,7 +56,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
replication_layer=mock.Mock(), replication_layer=mock.Mock(),
) )
self.handler = synapse.handlers.e2e_room_keys.E2eRoomKeysHandler(self.hs) self.handler = synapse.handlers.e2e_room_keys.E2eRoomKeysHandler(self.hs)
self.local_user = "@boris:" + self.hs.hostname; self.local_user = "@boris:" + self.hs.hostname
@defer.inlineCallbacks @defer.inlineCallbacks
def test_get_missing_current_version_info(self): def test_get_missing_current_version_info(self):
@ -184,7 +185,8 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_upload_room_keys_bogus_version(self): def test_upload_room_keys_bogus_version(self):
"""Check that we get a 404 on uploading keys when an nonexistent version is specified """Check that we get a 404 on uploading keys when an nonexistent version
is specified
""" """
version = yield self.handler.create_version(self.local_user, { version = yield self.handler.create_version(self.local_user, {
"algorithm": "m.megolm_backup.v1", "algorithm": "m.megolm_backup.v1",
@ -194,7 +196,9 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
res = None res = None
try: try:
yield self.handler.upload_room_keys(self.local_user, "bogus_version", room_keys) yield self.handler.upload_room_keys(
self.local_user, "bogus_version", room_keys
)
except errors.SynapseError as e: except errors.SynapseError as e:
res = e.code res = e.code
self.assertEqual(res, 404) self.assertEqual(res, 404)
@ -267,10 +271,11 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
yield self.handler.upload_room_keys(self.local_user, version, room_keys) yield self.handler.upload_room_keys(self.local_user, version, room_keys)
new_room_keys = copy.deepcopy(room_keys) new_room_keys = copy.deepcopy(room_keys)
new_room_key = new_room_keys['rooms']['!abc:matrix.org']['sessions']['c0ff33']
# test that increasing the message_index doesn't replace the existing session # test that increasing the message_index doesn't replace the existing session
new_room_keys['rooms']['!abc:matrix.org']['sessions']['c0ff33']['first_message_index'] = 2 new_room_key['first_message_index'] = 2
new_room_keys['rooms']['!abc:matrix.org']['sessions']['c0ff33']['session_data'] = 'new' new_room_key['session_data'] = 'new'
yield self.handler.upload_room_keys(self.local_user, version, new_room_keys) yield self.handler.upload_room_keys(self.local_user, version, new_room_keys)
res = yield self.handler.get_room_keys(self.local_user, version) res = yield self.handler.get_room_keys(self.local_user, version)
@ -280,7 +285,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
) )
# test that marking the session as verified however /does/ replace it # test that marking the session as verified however /does/ replace it
new_room_keys['rooms']['!abc:matrix.org']['sessions']['c0ff33']['is_verified'] = True new_room_key['is_verified'] = True
yield self.handler.upload_room_keys(self.local_user, version, new_room_keys) yield self.handler.upload_room_keys(self.local_user, version, new_room_keys)
res = yield self.handler.get_room_keys(self.local_user, version) res = yield self.handler.get_room_keys(self.local_user, version)
@ -291,8 +296,8 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
# test that a session with a higher forwarded_count doesn't replace one # test that a session with a higher forwarded_count doesn't replace one
# with a lower forwarding count # with a lower forwarding count
new_room_keys['rooms']['!abc:matrix.org']['sessions']['c0ff33']['forwarded_count'] = 2 new_room_key['forwarded_count'] = 2
new_room_keys['rooms']['!abc:matrix.org']['sessions']['c0ff33']['session_data'] = 'other' new_room_key['session_data'] = 'other'
yield self.handler.upload_room_keys(self.local_user, version, new_room_keys) yield self.handler.upload_room_keys(self.local_user, version, new_room_keys)
res = yield self.handler.get_room_keys(self.local_user, version) res = yield self.handler.get_room_keys(self.local_user, version)