From 9fe8fb74a1e21ab881c70111813266d67bfda016 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 17 Dec 2021 01:29:54 -0800 Subject: [PATCH] bpo-46111: Fix unittest tests in optimized mode (GH-30163) (cherry picked from commit 95a922b3bb3af247ec141d73fcdfbf68bb1d32a5) Co-authored-by: Serhiy Storchaka --- Lib/unittest/test/test_case.py | 2 ++ Lib/unittest/test/test_program.py | 4 ++-- Lib/unittest/test/testmock/testpatch.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py index 442651e1e488..9b3a598ba6c8 100644 --- 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 939af81b3b4c..4746d71e0b60 100644 --- 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 d8c1515f8346..233a5afffaed 100644 --- 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") -- 2.47.3