Refs #27804 -- Used subTest() in several tests.

4 files changed, 28 insertions, 20 deletions

diff --git a/tests/forms_tests/field_tests/test_filepathfield.py b/tests/forms_tests/field_tests/test_filepathfield.py
index cbdf97b4c2..56bf0e9fda 100644
--- a/tests/forms_tests/field_tests/test_filepathfield.py
+++ b/tests/forms_tests/field_tests/test_filepathfield.py
@@ -38,8 +38,9 @@ class FilePathFieldTest(SimpleTestCase):
             ('/django/forms/widgets.py', 'widgets.py')
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
-            self.assertEqual(exp[1], got[1])
-            self.assertTrue(got[0].endswith(exp[0]))
+            with self.subTest(expected=exp):
+                self.assertEqual(exp[1], got[1])
+                self.assertTrue(got[0].endswith(exp[0]))
         msg = "'Select a valid choice. fields.py is not one of the available choices.'"
         with self.assertRaisesMessage(ValidationError, msg):
             f.clean('fields.py')
@@ -61,8 +62,9 @@ class FilePathFieldTest(SimpleTestCase):
             ('/django/forms/widgets.py', 'widgets.py')
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
-            self.assertEqual(exp[1], got[1])
-            self.assertTrue(got[0].endswith(exp[0]))
+            with self.subTest(expected=exp):
+                self.assertEqual(exp[1], got[1])
+                self.assertTrue(got[0].endswith(exp[0]))
 
     def test_filepathfield_4(self):
         path = os.path.dirname(os.path.abspath(forms.__file__)) + '/'
@@ -80,8 +82,9 @@ class FilePathFieldTest(SimpleTestCase):
             ('/django/forms/widgets.py', 'widgets.py')
         ]
         for exp, got in zip(expected, fix_os_paths(f.choices)):
-            self.assertEqual(exp[1], got[1])
-            self.assertTrue(got[0].endswith(exp[0]))
+            with self.subTest(expected=exp):
+                self.assertEqual(exp[1], got[1])
+                self.assertTrue(got[0].endswith(exp[0]))
 
     def test_filepathfield_folders(self):
         path = os.path.abspath(os.path.join(__file__, '..', '..')) + '/tests/filepath_test_files/'
@@ -93,8 +96,9 @@ class FilePathFieldTest(SimpleTestCase):
         actual = fix_os_paths(f.choices)
         self.assertEqual(len(expected), len(actual))
         for exp, got in zip(expected, actual):
-            self.assertEqual(exp[1], got[1])
-            self.assertTrue(got[0].endswith(exp[0]))
+            with self.subTest(expected=exp):
+                self.assertEqual(exp[1], got[1])
+                self.assertTrue(got[0].endswith(exp[0]))
 
         f = FilePathField(path=path, allow_folders=True, allow_files=True)
         f.choices.sort()
@@ -110,5 +114,6 @@ class FilePathFieldTest(SimpleTestCase):
         actual = fix_os_paths(f.choices)
         self.assertEqual(len(expected), len(actual))
         for exp, got in zip(expected, actual):
-            self.assertEqual(exp[1], got[1])
-            self.assertTrue(got[0].endswith(exp[0]))
+            with self.subTest(expected=exp):
+                self.assertEqual(exp[1], got[1])
+                self.assertTrue(got[0].endswith(exp[0]))
diff --git a/tests/forms_tests/field_tests/test_urlfield.py b/tests/forms_tests/field_tests/test_urlfield.py
index 715e8e99e0..2ecf189112 100644
--- a/tests/forms_tests/field_tests/test_urlfield.py
+++ b/tests/forms_tests/field_tests/test_urlfield.py
@@ -127,8 +127,9 @@ class URLFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
             'http://العربية.idn.icann.org/',
         )
         for url in urls:
-            # Valid IDN
-            self.assertEqual(url, f.clean(url))
+            with self.subTest(url=url):
+                # Valid IDN
+                self.assertEqual(url, f.clean(url))
 
     def test_urlfield_10(self):
         """URLField correctly validates IPv6 (#18779)."""
@@ -138,7 +139,8 @@ class URLFieldTest(FormFieldAssertionsMixin, SimpleTestCase):
             'http://[a34:9238::]:8080/',
         )
         for url in urls:
-            self.assertEqual(url, f.clean(url))
+            with self.subTest(url=url):
+                self.assertEqual(url, f.clean(url))
 
     def test_urlfield_not_string(self):
         f = URLField(required=False)
diff --git a/tests/forms_tests/tests/test_forms.py b/tests/forms_tests/tests/test_forms.py
index 9f32953b47..63209a1f62 100644
--- a/tests/forms_tests/tests/test_forms.py
+++ b/tests/forms_tests/tests/test_forms.py
@@ -3008,7 +3008,8 @@ Good luck picking a username that doesn&#39;t already exist.</p>
         ]
 
         for args, kwargs, expected in testcases:
-            self.assertHTMLEqual(boundfield.label_tag(*args, **kwargs), expected)
+            with self.subTest(args=args, kwargs=kwargs):
+                self.assertHTMLEqual(boundfield.label_tag(*args, **kwargs), expected)
 
     def test_boundfield_label_tag_no_id(self):
         """
diff --git a/tests/forms_tests/tests/tests.py b/tests/forms_tests/tests/tests.py
index a1965cd47b..043b8e0edc 100644
--- a/tests/forms_tests/tests/tests.py
+++ b/tests/forms_tests/tests/tests.py
@@ -335,12 +335,12 @@ class EmptyLabelTestCase(TestCase):
         ]
 
         for form, key, expected in tests:
-            f = form({'name': 'some-key', key: ''})
-            self.assertTrue(f.is_valid())
-            m = f.save()
-            self.assertEqual(expected, getattr(m, key))
-            self.assertEqual('No Preference',
-                             getattr(m, 'get_{}_display'.format(key))())
+            with self.subTest(form=form):
+                f = form({'name': 'some-key', key: ''})
+                self.assertTrue(f.is_valid())
+                m = f.save()
+                self.assertEqual(expected, getattr(m, key))
+                self.assertEqual('No Preference', getattr(m, 'get_{}_display'.format(key))())
 
     def test_empty_field_integer(self):
         f = EmptyIntegerLabelChoiceForm()