Fix remaining DumpError issues in all test files

Co-authored-by: jb3 <20439493+jb3@users.noreply.github.com>

Author: Copilot

tests/bot/exts/backend/sync/test_base.py

@@ -39,8 +39,8 @@ async def test_sync_message_edited(self):
             (helpers.MockMessage(), ResponseCodeError(mock.MagicMock()), True),
         )
 
-        for message, side_effect, should_edit in subtests:
-            with self.subTest(message=message, side_effect=side_effect, should_edit=should_edit):
+        for i, (message, side_effect, should_edit) in enumerate(subtests):
+            with self.subTest(test_case=i, has_message=message is not None, should_edit=should_edit):
                 TestSyncer._sync.side_effect = side_effect
                 ctx = helpers.MockContext()
                 ctx.send.return_value = message
@@ -58,8 +58,8 @@ async def test_sync_message_sent(self):
             (helpers.MockContext(), helpers.MockMessage()),
         )
 
-        for ctx, message in subtests:
-            with self.subTest(ctx=ctx, message=message):
+        for i, (ctx, message) in enumerate(subtests):
+            with self.subTest(test_case=i, has_ctx=ctx is not None):
                 await TestSyncer.sync(self.guild, ctx)
 
                 if ctx is not None:

tests/bot/exts/backend/sync/test_cog.py

@@ -65,8 +65,8 @@ class SyncCogTests(SyncCogTestCase):
     @unittest.mock.patch("bot.exts.backend.sync._cog.create_task", new_callable=unittest.mock.MagicMock)
     async def test_sync_cog_sync_on_load(self, mock_create_task: unittest.mock.MagicMock):
         """Sync function should be synced on cog load only if guild is found."""
-        for guild in (helpers.MockGuild(), None):
-            with self.subTest(guild=guild):
+        for i, guild in enumerate((helpers.MockGuild(), None)):
+            with self.subTest(test_case=i, has_guild=guild is not None):
                 mock_create_task.reset_mock()
                 self.bot.reset_mock()
                 self.RoleSyncer.reset_mock()
@@ -126,8 +126,8 @@ async def patch_user_helper(self, side_effect: BaseException) -> None:
 
     async def test_sync_cog_patch_user(self):
         """A PATCH request should be sent and 404 errors ignored."""
-        for side_effect in (None, self.response_error(404)):
-            with self.subTest(side_effect=side_effect):
+        for i, side_effect in enumerate((None, self.response_error(404))):
+            with self.subTest(test_case=i, has_error=side_effect is not None):
                 await self.patch_user_helper(side_effect)
 
     async def test_sync_cog_patch_user_non_404(self):
@@ -207,7 +207,7 @@ async def test_sync_cog_on_guild_role_update(self):
 
         for should_put, attributes in subtests:
             for attribute in attributes:
-                with self.subTest(should_put=should_put, changed_attribute=attribute):
+                with self.subTest(should_put=should_put, attribute=attribute):
                     self.bot.api_client.put.reset_mock()
 
                     after_role_data = role_data.copy()
@@ -372,8 +372,8 @@ async def on_member_join_helper(self, side_effect: Exception) -> dict:
 
     async def test_sync_cog_on_member_join(self):
         """Should PUT user's data or POST it if the user doesn't exist."""
-        for side_effect in (None, self.response_error(404)):
-            with self.subTest(side_effect=side_effect):
+        for i, side_effect in enumerate((None, self.response_error(404))):
+            with self.subTest(test_case=i, has_error=side_effect is not None):
                 self.bot.api_client.post.reset_mock()
                 data = await self.on_member_join_helper(side_effect)
 
@@ -422,6 +422,6 @@ async def test_commands_require_admin(self):
             self.cog.sync_users_command,
         )
 
-        for cmd in cmds:
-            with self.subTest(cmd=cmd):
+        for i, cmd in enumerate(cmds):
+            with self.subTest(test_case=i):
                 await self.assertHasPermissionsCheck(cmd, {"administrator": True})

tests/bot/exts/filtering/test_settings_entries.py

@@ -144,8 +144,8 @@ def test_filtering_dms_when_necessary(self):
             (False, MockTextChannel(), True)
         )
 
-        for apply_in_dms, channel, expected in cases:
-            with self.subTest(apply_in_dms=apply_in_dms, channel=channel):
+        for i, (apply_in_dms, channel, expected) in enumerate(cases):
+            with self.subTest(test_case=i, apply_in_dms=apply_in_dms):
                 filter_dms = FilterDM(filter_dm=apply_in_dms)
                 self.ctx.channel = channel
 

tests/bot/exts/info/test_information.py

@@ -122,22 +122,22 @@ async def test_user_command_helper_method_get_requests(self):
             },
         )
 
-        for test_value in test_values:
+        for i, test_value in enumerate(test_values):
             helper_method = test_value["helper_method"]
             endpoint, params = test_value["expected_args"]
 
-            with self.subTest(method=helper_method, endpoint=endpoint, params=params):
+            with self.subTest(test_case=i, endpoint=endpoint):
                 await helper_method(self.member)
                 self.bot.api_client.get.assert_called_once_with(endpoint, params=params)
                 self.bot.api_client.get.reset_mock()
 
     async def _method_subtests(self, method, test_values, default_header):
         """Helper method that runs the subtests for the different helper methods."""
-        for test_value in test_values:
+        for i, test_value in enumerate(test_values):
             api_response = test_value["api response"]
             expected_lines = test_value["expected_lines"]
 
-            with self.subTest(method=method, api_response=api_response, expected_lines=expected_lines):
+            with self.subTest(test_case=i):
                 self.bot.api_client.get.return_value = api_response
 
                 expected_output = "\n".join(expected_lines)

tests/bot/exts/moderation/infraction/test_utils.py

@@ -235,8 +235,8 @@ async def test_send_infraction_embed(self, send_private_embed_mock):
             }
         ]
 
-        for case in test_cases:
-            with self.subTest(args=case["args"], expected=case["expected_output"], send=case["send_result"]):
+        for i, case in enumerate(test_cases):
+            with self.subTest(test_case=i, send=case["send_result"]):
                 send_private_embed_mock.reset_mock()
 
                 send_private_embed_mock.return_value = case["send_result"]
@@ -259,7 +259,7 @@ async def test_notify_pardon(self, send_private_embed_mock):
             test_case((self.user, "Test title", "Example content", Icons.user_update), Icons.user_update, False)
         ]
 
-        for case in test_cases:
+        for i, case in enumerate(test_cases):
             expected = Embed(
                 description="Example content",
                 colour=Colours.soft_green
@@ -268,7 +268,7 @@ async def test_notify_pardon(self, send_private_embed_mock):
                 icon_url=case.icon
             )
 
-            with self.subTest(args=case.args, expected=expected):
+            with self.subTest(test_case=i):
                 send_private_embed_mock.reset_mock()
 
                 send_private_embed_mock.return_value = case.send_result
@@ -288,13 +288,13 @@ async def test_send_private_embed(self):
         test_case = namedtuple("test_case", ["expected_output", "raised_exception"])
         test_cases = [
             test_case(True, None),
-            test_case(False, HTTPException(AsyncMock(), AsyncMock())),
-            test_case(False, Forbidden(AsyncMock(), AsyncMock())),
-            test_case(False, NotFound(AsyncMock(), AsyncMock()))
+            test_case(False, HTTPException(AsyncMock(), "test error")),
+            test_case(False, Forbidden(AsyncMock(), "test error")),
+            test_case(False, NotFound(AsyncMock(), "test error"))
         ]
 
-        for case in test_cases:
-            with self.subTest(expected=case.expected_output, raised=case.raised_exception):
+        for i, case in enumerate(test_cases):
+            with self.subTest(test_case=i, expected=case.expected_output):
                 self.user.send.reset_mock(side_effect=True)
                 self.user.send.side_effect = case.raised_exception
 

tests/bot/exts/moderation/test_silence.py

@@ -260,8 +260,8 @@ async def test_command(self, parser_mock):
         ctx = MockContext()
         parser_mock.return_value = (ctx.channel, 10)
 
-        for case in test_cases:
-            with self.subTest("Test command converters", args=case):
+        for i, case in enumerate(test_cases):
+            with self.subTest(msg="Test command converters", test_case=i):
                 await cog.silence.callback(cog, ctx, *case)
 
                 try:
@@ -433,10 +433,10 @@ async def test_sent_correct_message(self):
 
         targets = (MockTextChannel(), MockVoiceChannel(), None)
 
-        for (duration, message, was_silenced), target in itertools.product(test_cases, targets):
+        for i, ((duration, message, was_silenced), target) in enumerate(itertools.product(test_cases, targets)):
             with (
                 mock.patch.object(self.cog, "_set_silence_overwrites", return_value=was_silenced),
-                self.subTest(was_silenced=was_silenced, target=target, message=message),
+                self.subTest(test_case=i, was_silenced=was_silenced, has_target=target is not None),
                 mock.patch.object(self.cog, "send_message") as send_message
             ):
                 ctx = MockContext()
@@ -525,8 +525,8 @@ async def test_skipped_already_silenced(self):
             (True, MockVoiceChannel(), PermissionOverwrite(connect=False, speak=False)),
         )
 
-        for contains, channel, overwrite in subtests:
-            with self.subTest(contains=contains, is_text=isinstance(channel, MockTextChannel), overwrite=overwrite):
+        for i, (contains, channel, overwrite) in enumerate(subtests):
+            with self.subTest(test_case=i, contains=contains, is_text=isinstance(channel, MockTextChannel)):
                 self.cog.scheduler.__contains__.return_value = contains
                 channel.overwrites_for.return_value = overwrite
 
@@ -702,7 +702,7 @@ async def test_sent_correct_message(self):
 
         targets = (None, MockTextChannel())
 
-        for (was_unsilenced, message, overwrite), target in itertools.product(test_cases, targets):
+        for i, ((was_unsilenced, message, overwrite), target) in enumerate(itertools.product(test_cases, targets)):
             ctx = MockContext()
             ctx.channel.overwrites_for.return_value = overwrite
             if target:
@@ -711,7 +711,7 @@ async def test_sent_correct_message(self):
             with (
                 mock.patch.object(self.cog, "_unsilence", return_value=was_unsilenced),
                 mock.patch.object(self.cog, "send_message") as send_message,
-                self.subTest(was_unsilenced=was_unsilenced, overwrite=overwrite, target=target),
+                self.subTest(test_case=i, was_unsilenced=was_unsilenced, has_target=target is not None),
             ):
                 await self.cog.unsilence.callback(self.cog, ctx, channel=target)
 
@@ -722,8 +722,8 @@ async def test_skipped_already_unsilenced(self):
         """Permissions were not set and `False` was returned for an already unsilenced channel."""
         self.cog.scheduler.__contains__.return_value = False
 
-        for channel in (MockVoiceChannel(), MockTextChannel()):
-            with self.subTest(channel=channel):
+        for i, channel in enumerate((MockVoiceChannel(), MockTextChannel())):
+            with self.subTest(test_case=i):
                 self.assertFalse(await self.cog._unsilence(channel))
                 channel.set_permissions.assert_not_called()
 
@@ -811,8 +811,8 @@ async def test_cancelled_task(self):
 
     async def test_preserved_other_overwrites_text(self):
         """Text channel's other unrelated overwrites were not changed, including cache misses."""
-        for overwrite_json in ('{"send_messages": true, "add_reactions": null}', None):
-            with self.subTest(overwrite_json=overwrite_json):
+        for i, overwrite_json in enumerate(('{"send_messages": true, "add_reactions": null}', None)):
+            with self.subTest(test_case=i, has_overwrite=overwrite_json is not None):
                 if overwrite_json is None:
                     await self.cog.previous_overwrites.delete(self.text_channel.id)
                 else:
@@ -832,8 +832,8 @@ async def test_preserved_other_overwrites_text(self):
 
     async def test_preserved_other_overwrites_voice(self):
         """Voice channel's other unrelated overwrites were not changed, including cache misses."""
-        for overwrite_json in ('{"connect": true, "speak": true}', None):
-            with self.subTest(overwrite_json=overwrite_json):
+        for i, overwrite_json in enumerate(('{"connect": true, "speak": true}', None)):
+            with self.subTest(test_case=i, has_overwrite=overwrite_json is not None):
                 if overwrite_json is None:
                     await self.cog.previous_overwrites.delete(self.voice_channel.id)
                 else:
@@ -858,8 +858,8 @@ async def test_unsilence_role(self):
             (MockVoiceChannel(), self.cog.bot.get_guild(Guild.id).get_role(Roles.voice_verified))
         )
 
-        for channel, role in test_cases:
-            with self.subTest(channel=channel, role=role):
+        for i, (channel, role) in enumerate(test_cases):
+            with self.subTest(test_case=i):
                 await self.cog._unsilence_wrapper(channel, MockContext())
                 channel.overwrites_for.assert_called_with(role)
 

tests/bot/exts/recruitment/talentpool/test_review.py

@@ -141,8 +141,8 @@ async def test_is_ready_for_review(self):
             ([], None, True),
         )
 
-        for messages, last_review_timestamp, expected in cases:
-            with self.subTest(messages=messages, expected=expected):
+        for i, (messages, last_review_timestamp, expected) in enumerate(cases):
+            with self.subTest(test_case=i, expected=expected):
                 self.voting_channel.history = AsyncIterator(messages)
 
                 cache_get_mock = AsyncMock(return_value=last_review_timestamp)