From 60ce4878a0d205d9ff5f8be6b64c367addbb6afb Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Thu, 2 Dec 2021 16:01:58 +0000 Subject: [PATCH 1/3] Remove usage of setup_test_homeserver from test_main --- tests/storage/test_main.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/storage/test_main.py b/tests/storage/test_main.py index d2b7b8995200..41a6763a6f7c 100644 --- a/tests/storage/test_main.py +++ b/tests/storage/test_main.py @@ -18,15 +18,13 @@ from synapse.types import UserID from tests import unittest -from tests.utils import setup_test_homeserver -class DataStoreTestCase(unittest.TestCase): - @defer.inlineCallbacks - def setUp(self): - hs = yield setup_test_homeserver(self.addCleanup) +class DataStoreTestCase(unittest.HomeserverTestCase): + def setUp(self) -> None: + super(DataStoreTestCase, self).setUp() - self.store = hs.get_datastore() + self.store = self.hs.get_datastore() self.user = UserID.from_string("@abcde:test") self.displayname = "Frank" From 5b8139387dfd694356a7eb2dedf2aca91d794984 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Thu, 2 Dec 2021 16:02:20 +0000 Subject: [PATCH 2/3] Get rid of inlineCallbacks too --- tests/storage/test_main.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/storage/test_main.py b/tests/storage/test_main.py index 41a6763a6f7c..f8d11bac4ec5 100644 --- a/tests/storage/test_main.py +++ b/tests/storage/test_main.py @@ -13,8 +13,6 @@ # limitations under the License. -from twisted.internet import defer - from synapse.types import UserID from tests import unittest @@ -29,24 +27,21 @@ def setUp(self) -> None: self.user = UserID.from_string("@abcde:test") self.displayname = "Frank" - @defer.inlineCallbacks - def test_get_users_paginate(self): - yield defer.ensureDeferred( - self.store.register_user(self.user.to_string(), "pass") - ) - yield defer.ensureDeferred(self.store.create_profile(self.user.localpart)) - yield defer.ensureDeferred( + def test_get_users_paginate(self) -> None: + self.get_success(self.store.register_user(self.user.to_string(), "pass")) + self.get_success(self.store.create_profile(self.user.localpart)) + self.get_success( self.store.set_profile_displayname(self.user.localpart, self.displayname) ) - users, total = yield defer.ensureDeferred( + users, total = self.get_success( self.store.get_users_paginate(0, 10, name="bc", guests=False) ) self.assertEquals(1, total) self.assertEquals(self.displayname, users.pop()["displayname"]) - users, total = yield defer.ensureDeferred( + users, total = self.get_success( self.store.get_users_paginate(0, 10, name="BC", guests=False) ) From fc85990dfbedf8509a691635f39a333aa905a099 Mon Sep 17 00:00:00 2001 From: "Olivier Wilkinson (reivilibre)" Date: Thu, 2 Dec 2021 16:03:48 +0000 Subject: [PATCH 3/3] Newsfile Signed-off-by: Olivier Wilkinson (reivilibre) --- changelog.d/11493.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/11493.misc diff --git a/changelog.d/11493.misc b/changelog.d/11493.misc new file mode 100644 index 000000000000..646584a0d1cc --- /dev/null +++ b/changelog.d/11493.misc @@ -0,0 +1 @@ +Clean up `tests.storage.test_main` to remove use of legacy code. \ No newline at end of file