Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix idiocies and so make tests pass

Browse Source
This commit is contained in:
Matthew Hodgson 2017-12-31 14:35:25 +00:00 committed by Hubert Chathi
parent 174be586e5
commit 15d513f16f
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
synapse/storage/e2e_room_keys.py
View File

@ -207,6 +207,7 @@ class EndToEndRoomKeyStore(SQLBaseStore):
this_version = version this_version = version
return self._simple_select_one_txn( return self._simple_select_one_txn(
txn,
table="e2e_room_keys_versions", table="e2e_room_keys_versions",
keyvalues={ keyvalues={
"user_id": user_id, "user_id": user_id,
@ -243,9 +244,9 @@ class EndToEndRoomKeyStore(SQLBaseStore):
) )
current_version = txn.fetchone()[0] current_version = txn.fetchone()[0]
if current_version is None: if current_version is None:
current_version = 0 current_version = '0'
new_version = current_version + 1 new_version = str(int(current_version) + 1)
self._simple_insert_txn( self._simple_insert_txn(
txn, txn,

2
synapse/storage/schema/delta/46/e2e_room_keys.sql
View File

@ -35,4 +35,4 @@ CREATE TABLE e2e_room_keys_versions (
auth_data TEXT NOT NULL auth_data TEXT NOT NULL
); );
CREATE UNIQUE INDEX e2e_room_keys_versions_user_idx ON e2e_room_keys_versions(user_id); CREATE UNIQUE INDEX e2e_room_keys_versions_idx ON e2e_room_keys_versions(user_id, version);

17
tests/handlers/test_e2e_room_keys.py
View File

@ -37,7 +37,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
handlers=None, handlers=None,
replication_layer=mock.Mock(), replication_layer=mock.Mock(),
) )
self.handler = synapse.handlers.e2e_keys.E2eRoomKeysHandler(self.hs) self.handler = synapse.handlers.e2e_room_keys.E2eRoomKeysHandler(self.hs)
@defer.inlineCallbacks @defer.inlineCallbacks
@ -46,6 +46,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
if there is no version. if there is no version.
""" """
local_user = "@boris:" + self.hs.hostname local_user = "@boris:" + self.hs.hostname
res = None
try: try:
res = yield self.handler.get_version_info(local_user); res = yield self.handler.get_version_info(local_user);
except errors.SynapseError as e: except errors.SynapseError as e:
@ -58,6 +59,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
if it doesn't exist. if it doesn't exist.
""" """
local_user = "@boris:" + self.hs.hostname local_user = "@boris:" + self.hs.hostname
res = None
try: try:
res = yield self.handler.get_version_info(local_user, "mrflibble"); res = yield self.handler.get_version_info(local_user, "mrflibble");
except errors.SynapseError as e: except errors.SynapseError as e:
@ -69,7 +71,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
"""Check that we can create and then retrieve versions. """Check that we can create and then retrieve versions.
""" """
local_user = "@boris:" + self.hs.hostname local_user = "@boris:" + self.hs.hostname
res = yield self.handler.create_version(user_id, { res = yield self.handler.create_version(local_user, {
"algorithm": "m.megolm_backup.v1", "algorithm": "m.megolm_backup.v1",
"auth_data": "first_version_auth_data", "auth_data": "first_version_auth_data",
}); });
@ -92,7 +94,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
}); });
# upload a new one... # upload a new one...
res = yield self.handler.create_version(user_id, { res = yield self.handler.create_version(local_user, {
"algorithm": "m.megolm_backup.v1", "algorithm": "m.megolm_backup.v1",
"auth_data": "second_version_auth_data", "auth_data": "second_version_auth_data",
}); });
@ -111,7 +113,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
"""Check that we can create and then delete versions. """Check that we can create and then delete versions.
""" """
local_user = "@boris:" + self.hs.hostname local_user = "@boris:" + self.hs.hostname
res = yield self.handler.create_version(user_id, { res = yield self.handler.create_version(local_user, {
"algorithm": "m.megolm_backup.v1", "algorithm": "m.megolm_backup.v1",
"auth_data": "first_version_auth_data", "auth_data": "first_version_auth_data",
}); });
@ -121,6 +123,7 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
yield self.handler.delete_version(local_user, "1"); yield self.handler.delete_version(local_user, "1");
# check that it's gone # check that it's gone
res = None
try: try:
res = yield self.handler.get_version_info(local_user, "1"); res = yield self.handler.get_version_info(local_user, "1");
except errors.SynapseError as e: except errors.SynapseError as e:
@ -130,12 +133,12 @@ class E2eRoomKeysHandlerTestCase(unittest.TestCase):
@defer.inlineCallbacks @defer.inlineCallbacks
def test_get_room_keys(self): def test_get_room_keys(self):
pass yield None
@defer.inlineCallbacks @defer.inlineCallbacks
def test_upload_room_keys(self): def test_upload_room_keys(self):
pass yield None
@defer.inlineCallbacks @defer.inlineCallbacks
def test_delete_room_keys(self): def test_delete_room_keys(self):
pass yield None