From ae68f1947ca30f8442ac04cdb20d0136b83d06ed Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sat, 21 Jan 2023 15:33:53 +0000 Subject: [PATCH 1/4] Ignore type errors for mocking methods mypy doesn't have a great way of handling this yet --- tests/server_notices/test_resource_limits_server_notices.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/server_notices/test_resource_limits_server_notices.py b/tests/server_notices/test_resource_limits_server_notices.py index 7cbc40736c59..f731a5922183 100644 --- a/tests/server_notices/test_resource_limits_server_notices.py +++ b/tests/server_notices/test_resource_limits_server_notices.py @@ -69,7 +69,7 @@ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None: self._rlsn._store.user_last_seen_monthly_active = Mock( return_value=make_awaitable(1000) ) - self._rlsn._server_notices_manager.send_notice = Mock( + self._rlsn._server_notices_manager.send_notice = Mock( # type: ignore[assignment] return_value=make_awaitable(Mock()) ) self._send_notice = self._rlsn._server_notices_manager.send_notice @@ -82,8 +82,8 @@ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None: self._rlsn._server_notices_manager.maybe_get_notice_room_for_user = Mock( return_value=make_awaitable("!something:localhost") ) - self._rlsn._store.add_tag_to_room = Mock(return_value=make_awaitable(None)) - self._rlsn._store.get_tags_for_room = Mock(return_value=make_awaitable({})) + self._rlsn._store.add_tag_to_room = Mock(return_value=make_awaitable(None)) # type: ignore[assignment] + self._rlsn._store.get_tags_for_room = Mock(return_value=make_awaitable({})) # type: ignore[assignment] @override_config({"hs_disabled": True}) def test_maybe_send_server_notice_disabled_hs(self): From 8f363fcc782e9073c56937360f5324cec9146cb0 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sat, 21 Jan 2023 15:35:04 +0000 Subject: [PATCH 2/4] Fix type of `invites`, ensure user_id/tok will be set --- .../server_notices/test_resource_limits_server_notices.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/server_notices/test_resource_limits_server_notices.py b/tests/server_notices/test_resource_limits_server_notices.py index f731a5922183..dadc6efcbf75 100644 --- a/tests/server_notices/test_resource_limits_server_notices.py +++ b/tests/server_notices/test_resource_limits_server_notices.py @@ -361,9 +361,10 @@ def _trigger_notice_and_join(self) -> Tuple[str, str, str]: tok: The access token of the user that joined the room. room_id: The ID of the room that's been joined. """ - user_id = None - tok = None - invites = [] + # We need at least one user to process + self.assertGreater(self.hs.config.server.max_mau_value, 0) + + invites = {} # Register as many users as the MAU limit allows. for i in range(self.hs.config.server.max_mau_value): From f6329d3967eeb1e6c8c85fe418493c06d32a39a8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sat, 21 Jan 2023 15:40:17 +0000 Subject: [PATCH 3/4] Remove test_resource_limits_server_notices.py from the mypy exclude list --- mypy.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/mypy.ini b/mypy.ini index 468bfe588ccc..edd7fb30af24 100644 --- a/mypy.ini +++ b/mypy.ini @@ -51,7 +51,6 @@ exclude = (?x) |tests/rest/client/test_transactions.py |tests/rest/media/v1/test_media_storage.py |tests/server.py - |tests/server_notices/test_resource_limits_server_notices.py |tests/test_state.py |tests/test_terms_auth.py )$ From e0f87569593452df49d45b0bbc07513878c0b0ea Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Sat, 21 Jan 2023 15:46:37 +0000 Subject: [PATCH 4/4] changelog --- changelog.d/14889.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/14889.misc diff --git a/changelog.d/14889.misc b/changelog.d/14889.misc new file mode 100644 index 000000000000..9f5384e60e78 --- /dev/null +++ b/changelog.d/14889.misc @@ -0,0 +1 @@ +Add missing type hints. \ No newline at end of file