From: Victor Stinner <victor.stinner@gmail.com>
Date: Wed, 2 Sep 2015 22:07:47 +0000 (+0200)
Subject: Fix test_warnings: don't modify warnings.filters
X-Git-Tag: v3.5.1rc1~427^2~40^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c4055208758c6e85f00674eae24e0351b659c5a;p=python

Fix test_warnings: don't modify warnings.filters

BaseTest now ensures that unittest.TestCase.assertWarns() uses the same
warnings module than warnings.catch_warnings(). Otherwise,
warnings.catch_warnings() will be unable to remove the added filter.
---

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index ddcea8e3a0..b519f0a623 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -44,6 +44,7 @@ class BaseTest:
     """Basic bookkeeping required for testing."""
 
     def setUp(self):
+        self.old_unittest_module = unittest.case.warnings
         # The __warningregistry__ needs to be in a pristine state for tests
         # to work properly.
         if '__warningregistry__' in globals():
@@ -55,10 +56,15 @@ class BaseTest:
         # The 'warnings' module must be explicitly set so that the proper
         # interaction between _warnings and 'warnings' can be controlled.
         sys.modules['warnings'] = self.module
+        # Ensure that unittest.TestCase.assertWarns() uses the same warnings
+        # module than warnings.catch_warnings(). Otherwise,
+        # warnings.catch_warnings() will be unable to remove the added filter.
+        unittest.case.warnings = self.module
         super(BaseTest, self).setUp()
 
     def tearDown(self):
         sys.modules['warnings'] = original_warnings
+        unittest.case.warnings = self.old_unittest_module
         super(BaseTest, self).tearDown()
 
 class PublicAPITests(BaseTest):