bpo-46111: Fix unittest tests in optimized mode (GH-30163)

(cherry picked from commit 95a922b3bb3af247ec141d73fcdfbf68bb1d32a5)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py
index 65dc0c65d556648e6d4ea7ca083e0f89b32ff0c8..0ce23dd1a686f52b18f3f597ad53fdf23dbed043 100644 (file)
--- a/Lib/unittest/test/test_case.py
+++ b/Lib/unittest/test/test_case.py
@@ -611,6 +611,8 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
                  'Tests shortDescription() for a method with a longer '
                  'docstring.')
 
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "Docstrings are omitted with -O2 and above")
     def testShortDescriptionWhitespaceTrimming(self):
         """
             Tests shortDescription() whitespace is trimmed, so that the first

diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py
index 939af81b3b4cdb447a517259a650163bf83462de..4746d71e0b60393ead8a114a724a66a94d979e48 100644 (file)
--- a/Lib/unittest/test/test_program.py
+++ b/Lib/unittest/test/test_program.py
@@ -58,9 +58,9 @@ class Test_TestProgram(unittest.TestCase):
 
     class FooBar(unittest.TestCase):
         def testPass(self):
-            assert True
+            pass
         def testFail(self):
-            assert False
+            raise AssertionError
 
     class FooBarLoader(unittest.TestLoader):
         """Test loader that returns a suite containing FooBar."""

diff --git a/Lib/unittest/test/testmock/testpatch.py b/Lib/unittest/test/testmock/testpatch.py
index d8c1515f8346c33894e10d1591bd510215a5bbba..233a5afffaed4a5f6fbb65a398b1b40ce19b4a9f 100644 (file)
--- a/Lib/unittest/test/testmock/testpatch.py
+++ b/Lib/unittest/test/testmock/testpatch.py
@@ -1875,9 +1875,10 @@ class PatchTest(unittest.TestCase):
             self.assertEqual(foo(), 1)
         self.assertEqual(foo(), 0)
 
+        orig_doc = foo.__doc__
         with patch.object(foo, '__doc__', "FUN"):
             self.assertEqual(foo.__doc__, "FUN")
-        self.assertEqual(foo.__doc__, "TEST")
+        self.assertEqual(foo.__doc__, orig_doc)
 
         with patch.object(foo, '__module__', "testpatch2"):
             self.assertEqual(foo.__module__, "testpatch2")