Use assertExceptionIsLike().

Author: serhiy-storchaka

Lib/test/test_unittest/test_runner.py

@@ -13,6 +13,7 @@
     LoggingResult,
     ResultWithNoStartTestRunStopTestRun,
 )
+from test.support.testcase import ExceptionIsLikeMixin
 
 
 def resultFactory(*_):
@@ -604,7 +605,7 @@ class EmptyTest(unittest.TestCase):
 
 
 @support.force_not_colorized_test_class
-class TestModuleCleanUp(unittest.TestCase):
+class TestModuleCleanUp(ExceptionIsLikeMixin, unittest.TestCase):
     def test_add_and_do_ModuleCleanup(self):
         module_cleanups = []
 
@@ -648,9 +649,9 @@ class Module(object):
                           (module_cleanup_bad, (), {})])
         with self.assertRaises(Exception) as e:
             unittest.case.doModuleCleanups()
-        e = e.exception
-        self.assertEqual(str(e), 'module cleanup failed (1 sub-exception)')
-        self.assertEqual(str(e.exceptions[0]), 'CleanUpExc')
+        self.assertExceptionIsLike(e.exception,
+                ExceptionGroup('module cleanup failed',
+                               [CustomError('CleanUpExc')]))
         self.assertEqual(unittest.case._module_cleanups, [])
 
     def test_doModuleCleanup_with_multiple_errors_in_addModuleCleanup(self):
@@ -665,26 +666,30 @@ class Module:
             unittest.addModuleCleanup(module_cleanup_bad2)
         with self.assertRaises(ExceptionGroup) as e:
             unittest.case.doModuleCleanups()
-        e = e.exception
-        self.assertEqual(str(e), 'module cleanup failed (2 sub-exceptions)')
-        self.assertEqual(str(e.exceptions[0]), 'CleanUpExc2')
-        self.assertEqual(str(e.exceptions[1]), 'CleanUpExc1')
+        self.assertExceptionIsLike(e.exception,
+                ExceptionGroup('module cleanup failed', [
+                    ValueError('CleanUpExc2'),
+                    TypeError('CleanUpExc1'),
+                ]))
 
     def test_doModuleCleanup_with_exception_group_in_addModuleCleanup(self):
         def module_cleanup_bad():
-            raise ExceptionGroup('CleanUpExc', [TypeError('CleanUpExc1'),
-                                                ValueError('CleanUpExc2')])
+            raise ExceptionGroup('CleanUpExc', [
+                ValueError('CleanUpExc2'),
+                TypeError('CleanUpExc1'),
+            ])
 
         class Module:
             unittest.addModuleCleanup(module_cleanup_bad)
         with self.assertRaises(ExceptionGroup) as e:
             unittest.case.doModuleCleanups()
-        e = e.exception
-        self.assertEqual(str(e), 'module cleanup failed (1 sub-exception)')
-        e = e.exceptions[0]
-        self.assertEqual(str(e), 'CleanUpExc (2 sub-exceptions)')
-        self.assertEqual(str(e.exceptions[0]), 'CleanUpExc1')
-        self.assertEqual(str(e.exceptions[1]), 'CleanUpExc2')
+        self.assertExceptionIsLike(e.exception,
+                ExceptionGroup('module cleanup failed', [
+                    ExceptionGroup('CleanUpExc', [
+                        ValueError('CleanUpExc2'),
+                        TypeError('CleanUpExc1'),
+                    ]),
+                ]))
 
     def test_addModuleCleanup_arg_errors(self):
         cleanups = []
@@ -908,9 +913,9 @@ def tearDownClass(cls):
         suite = unittest.defaultTestLoader.loadTestsFromTestCase(TestableTest)
         with self.assertRaises(Exception) as cm:
             suite.debug()
-        e = cm.exception
-        self.assertEqual(str(e), 'module cleanup failed (1 sub-exception)')
-        self.assertEqual(str(e.exceptions[0]), 'CleanUpExc')
+        self.assertExceptionIsLike(cm.exception,
+                ExceptionGroup('module cleanup failed',
+                               [CustomError('CleanUpExc')]))
         self.assertEqual(ordering, ['setUpModule', 'setUpClass', 'test',
                                     'tearDownClass', 'tearDownModule', 'cleanup_exc'])
         self.assertEqual(unittest.case._module_cleanups, [])