From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 16 Nov 2013 22:14:35 +0000 (+0200)
Subject: Issue #19594: Use specific asserts in unittest tests.
X-Git-Tag: v3.4.0b1~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc39869095d1d24084965d2c41056750ec579763;p=thirdparty%2FPython%2Fcpython.git

Issue #19594: Use specific asserts in unittest tests.
---

bc39869095d1d24084965d2c41056750ec579763
diff --cc Lib/unittest/test/test_loader.py
index b1782a293630,fcd2e0762450..b62a1b5c5411
--- a/Lib/unittest/test/test_loader.py
+++ b/Lib/unittest/test/test_loader.py
@@@ -1305,8 -1305,4 +1305,8 @@@ class Test_TestLoader(unittest.TestCase
      # "The default value is the TestSuite class"
      def test_suiteClass__default_value(self):
          loader = unittest.TestLoader()
-         self.assertTrue(loader.suiteClass is unittest.TestSuite)
+         self.assertIs(loader.suiteClass, unittest.TestSuite)
 +
 +
 +if __name__ == "__main__":
 +    unittest.main()
diff --cc Lib/unittest/test/test_result.py
index 6dd9bb0f9e8e,7d40725cf2c6..489fe177546a
--- a/Lib/unittest/test/test_result.py
+++ b/Lib/unittest/test/test_result.py
@@@ -224,43 -224,9 +224,43 @@@ class Test_TestResult(unittest.TestCase
          self.assertEqual(result.shouldStop, False)
  
          test_case, formatted_exc = result.errors[0]
-         self.assertTrue(test_case is test)
+         self.assertIs(test_case, test)
          self.assertIsInstance(formatted_exc, str)
  
 +    def test_addSubTest(self):
 +        class Foo(unittest.TestCase):
 +            def test_1(self):
 +                nonlocal subtest
 +                with self.subTest(foo=1):
 +                    subtest = self._subtest
 +                    try:
 +                        1/0
 +                    except ZeroDivisionError:
 +                        exc_info_tuple = sys.exc_info()
 +                    # Register an error by hand (to check the API)
 +                    result.addSubTest(test, subtest, exc_info_tuple)
 +                    # Now trigger a failure
 +                    self.fail("some recognizable failure")
 +
 +        subtest = None
 +        test = Foo('test_1')
 +        result = unittest.TestResult()
 +
 +        test.run(result)
 +
 +        self.assertFalse(result.wasSuccessful())
 +        self.assertEqual(len(result.errors), 1)
 +        self.assertEqual(len(result.failures), 1)
 +        self.assertEqual(result.testsRun, 1)
 +        self.assertEqual(result.shouldStop, False)
 +
 +        test_case, formatted_exc = result.errors[0]
 +        self.assertIs(test_case, subtest)
 +        self.assertIn("ZeroDivisionError", formatted_exc)
 +        test_case, formatted_exc = result.failures[0]
 +        self.assertIs(test_case, subtest)
 +        self.assertIn("some recognizable failure", formatted_exc)
 +
      def testGetDescriptionWithoutDocstring(self):
          result = unittest.TextTestResult(None, True, 1)
          self.assertEqual(