From ae2db50f1de9a8d2c5c70ca9a2983f55b0ac1a95 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 26 Aug 2020 11:24:51 +0100 Subject: [PATCH 1/3] Fix unit test not awaiting Broke in #8100 --- tests/rest/client/v1/test_rooms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index c6c6edeac299..d3c73535d63e 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -715,7 +715,7 @@ def test_join_local_ratelimit_profile_change(self): # Create a profile for the user, since it hasn't been done on registration. store = self.hs.get_datastore() - store.create_profile(UserID.from_string(self.user_id).localpart) + self.get_success(store.create_profile(UserID.from_string(self.user_id).localpart)) # Update the display name for the user. path = "/_matrix/client/r0/profile/%s/displayname" % self.user_id From d7a4b3876aaf74206d8b5f36738f5365d52b1e96 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 26 Aug 2020 11:26:31 +0100 Subject: [PATCH 2/3] Newsfile --- changelog.d/8172.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/8172.misc diff --git a/changelog.d/8172.misc b/changelog.d/8172.misc new file mode 100644 index 000000000000..dfe4c03171d6 --- /dev/null +++ b/changelog.d/8172.misc @@ -0,0 +1 @@ +Convert various parts of the codebase to async/await. From 420e05c274470b96517e936fe9d90a28f01b5e70 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 26 Aug 2020 11:30:35 +0100 Subject: [PATCH 3/3] pep8 --- tests/rest/client/v1/test_rooms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index d3c73535d63e..b78d78a67618 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -715,7 +715,9 @@ def test_join_local_ratelimit_profile_change(self): # Create a profile for the user, since it hasn't been done on registration. store = self.hs.get_datastore() - self.get_success(store.create_profile(UserID.from_string(self.user_id).localpart)) + self.get_success( + store.create_profile(UserID.from_string(self.user_id).localpart) + ) # Update the display name for the user. path = "/_matrix/client/r0/profile/%s/displayname" % self.user_id