Fix additional DumpError issues in test files

Co-authored-by: jb3 <[email protected]>

Author: Copilot

tests/bot/test_converters.py

@@ -191,8 +191,8 @@ async def test_isodatetime_converter_for_valid(self):
 
         converter = ISODateTime()
 
-        for datetime_string, expected_dt in test_values:
-            with self.subTest(datetime_string=datetime_string, expected_dt=expected_dt):
+        for i, (datetime_string, expected_dt) in enumerate(test_values):
+            with self.subTest(test_case=i, datetime_string=datetime_string):
                 converted_dt = await converter.convert(self.context, datetime_string)
                 self.assertEqual(converted_dt, expected_dt)
 

tests/bot/utils/test_message_cache.py

@@ -177,8 +177,8 @@ def test_slicing_with_unfilled_cache(self):
             for msg in messages:
                 cache.append(msg)
 
-            for slice_ in slices:
-                with self.subTest(current_loop=(size, slice_)):
+            for i, slice_ in enumerate(slices):
+                with self.subTest(size=size, slice_index=i):
                     self.assertListEqual(cache[slice_], messages[slice_])
 
     def test_slicing_with_overfilled_cache(self):
@@ -199,8 +199,8 @@ def test_slicing_with_overfilled_cache(self):
                 cache.append(msg)
             messages = messages[size // 2:]
 
-            for slice_ in slices:
-                with self.subTest(current_loop=(size, slice_)):
+            for i, slice_ in enumerate(slices):
+                with self.subTest(size=size, slice_index=i):
                     self.assertListEqual(cache[slice_], messages[slice_])
 
     def test_length(self):

tests/bot/utils/test_time.py

@@ -32,8 +32,8 @@ def test_humanize_delta_should_normal_usage(self):
             (relativedelta(days=2, hours=2), "days", 2, "2 days"),
         )
 
-        for delta, precision, max_units, expected in test_cases:
-            with self.subTest(delta=delta, precision=precision, max_units=max_units, expected=expected):
+        for i, (delta, precision, max_units, expected) in enumerate(test_cases):
+            with self.subTest(test_case=i, precision=precision, max_units=max_units, expected=expected):
                 actual = time.humanize_delta(delta, precision=precision, max_units=max_units)
                 self.assertEqual(actual, expected)
 
@@ -57,8 +57,8 @@ def test_format_with_duration_none_expiry(self):
             (None, "Why hello there!", float("inf"), None),
         )
 
-        for expiry, date_from, max_units, expected in test_cases:
-            with self.subTest(expiry=expiry, date_from=date_from, max_units=max_units, expected=expected):
+        for i, (expiry, date_from, max_units, expected) in enumerate(test_cases):
+            with self.subTest(test_case=i, expiry=expiry, max_units=max_units, expected=expected):
                 self.assertEqual(time.format_with_duration(expiry, date_from, max_units), expected)
 
     def test_format_with_duration_custom_units(self):
@@ -70,8 +70,8 @@ def test_format_with_duration_custom_units(self):
              "<t:32531918940:f> (6 months, 28 days, 23 hours and 54 minutes)")
         )
 
-        for expiry, date_from, max_units, expected in test_cases:
-            with self.subTest(expiry=expiry, date_from=date_from, max_units=max_units, expected=expected):
+        for i, (expiry, date_from, max_units, expected) in enumerate(test_cases):
+            with self.subTest(test_case=i, max_units=max_units, expected=expected):
                 self.assertEqual(time.format_with_duration(expiry, date_from, max_units), expected)
 
     def test_format_with_duration_normal_usage(self):
@@ -94,8 +94,8 @@ def test_format_with_duration_normal_usage(self):
             (None, datetime(2019, 11, 23, 23, 49, 5, tzinfo=UTC), 2, None),
         )
 
-        for expiry, date_from, max_units, expected in test_cases:
-            with self.subTest(expiry=expiry, date_from=date_from, max_units=max_units, expected=expected):
+        for i, (expiry, date_from, max_units, expected) in enumerate(test_cases):
+            with self.subTest(test_case=i, max_units=max_units, expected=expected):
                 self.assertEqual(time.format_with_duration(expiry, date_from, max_units), expected)
 
     def test_until_expiration_with_duration_none_expiry(self):
@@ -109,8 +109,8 @@ def test_until_expiration_with_duration_custom_units(self):
             ("3000-11-23T20:09:00Z", "<t:32531918940:R>")
         )
 
-        for expiry, expected in test_cases:
-            with self.subTest(expiry=expiry, expected=expected):
+        for i, (expiry, expected) in enumerate(test_cases):
+            with self.subTest(test_case=i, expiry=expiry, expected=expected):
                 self.assertEqual(time.until_expiration(expiry,), expected)
 
     def test_until_expiration_normal_usage(self):
@@ -123,6 +123,6 @@ def test_until_expiration_normal_usage(self):
             ("3000-11-23T20:09:00Z", "<t:32531918940:R>"),
         )
 
-        for expiry, expected in test_cases:
-            with self.subTest(expiry=expiry, expected=expected):
+        for i, (expiry, expected) in enumerate(test_cases):
+            with self.subTest(test_case=i, expiry=expiry, expected=expected):
                 self.assertEqual(time.until_expiration(expiry), expected)

tests/test_helpers.py

@@ -153,8 +153,8 @@ def test_mocks_allows_access_to_attributes_part_of_spec(self):
             (helpers.MockMessage(), "mention_everyone"),
         )
 
-        for mock, valid_attribute in mocks:
-            with self.subTest(mock=mock):
+        for i, (mock, valid_attribute) in enumerate(mocks):
+            with self.subTest(test_case=i, attribute=valid_attribute):
                 try:
                     getattr(mock, valid_attribute)
                 except AttributeError:
@@ -183,8 +183,8 @@ def test_mocks_rejects_access_to_attributes_not_part_of_spec(self):
             helpers.MockMessage(),
         )
 
-        for mock in mocks:
-            with self.subTest(mock=mock), self.assertRaises(AttributeError):
+        for i, mock in enumerate(mocks):
+            with self.subTest(test_case=i), self.assertRaises(AttributeError):
                 mock.the_cake_is_a_lie  # noqa: B018
 
     def test_mocks_use_mention_when_provided_as_kwarg(self):
@@ -195,8 +195,8 @@ def test_mocks_use_mention_when_provided_as_kwarg(self):
             (helpers.MockTextChannel, "channel mention"),
         )
 
-        for mock_type, mention in test_cases:
-            with self.subTest(mock_type=mock_type, mention=mention):
+        for i, (mock_type, mention) in enumerate(test_cases):
+            with self.subTest(test_case=i, mention=mention):
                 mock = mock_type(mention=mention)
                 self.assertEqual(mock.mention, mention)
 
@@ -276,15 +276,15 @@ class MockScragly(helpers.HashableMixin):
 
     def test_mock_class_with_hashable_mixin_uses_id_for_hashing(self):
         """Test if the MagicMock subclasses that implement the HashableMixin use id for hash."""
-        for mock in self.hashable_mocks:
-            with self.subTest(mock_class=mock):
+        for i, mock in enumerate(self.hashable_mocks):
+            with self.subTest(test_case=i):
                 instance = helpers.MockRole(id=100)
                 self.assertEqual(hash(instance), instance.id)
 
     def test_mock_class_with_hashable_mixin_uses_id_for_equality(self):
         """Test if MagicMocks that implement the HashableMixin use id for equality comparisons."""
-        for mock_class in self.hashable_mocks:
-            with self.subTest(mock_class=mock_class):
+        for i, mock_class in enumerate(self.hashable_mocks):
+            with self.subTest(test_case=i):
                 instance_one = mock_class()
                 instance_two = mock_class()
                 instance_three = mock_class()
@@ -298,8 +298,8 @@ def test_mock_class_with_hashable_mixin_uses_id_for_equality(self):
 
     def test_mock_class_with_hashable_mixin_uses_id_for_nonequality(self):
         """Test if MagicMocks that implement HashableMixin use id for nonequality comparisons."""
-        for mock_class in self.hashable_mocks:
-            with self.subTest(mock_class=mock_class):
+        for i, mock_class in enumerate(self.hashable_mocks):
+            with self.subTest(test_case=i):
                 instance_one = mock_class()
                 instance_two = mock_class()
                 instance_three = mock_class()
@@ -336,8 +336,8 @@ def test_spec_propagation_of_mock_subclasses(self):
             (helpers.MockReaction, "me"),
         )
 
-        for mock_type, valid_attribute in test_values:
-            with self.subTest(mock_type=mock_type, attribute=valid_attribute):
+        for i, (mock_type, valid_attribute) in enumerate(test_values):
+            with self.subTest(test_case=i, attribute=valid_attribute):
                 mock = mock_type()
                 self.assertTrue(isinstance(mock, mock_type))
                 attribute = getattr(mock, valid_attribute)