Commit ce3d2214 authored by Brett Cannon's avatar Brett Cannon

test_warnings ironically had a single test that was not protecting the warnings

filter and was resetting it.
parent 2da4d628
...@@ -460,14 +460,14 @@ class _WarningsTests(BaseTest): ...@@ -460,14 +460,14 @@ class _WarningsTests(BaseTest):
self.failUnless(text in result) self.failUnless(text in result)
def test_showwarning_not_callable(self): def test_showwarning_not_callable(self):
self.module.filterwarnings("always", category=UserWarning) with original_warnings.catch_warnings(module=self.module):
old_showwarning = self.module.showwarning self.module.filterwarnings("always", category=UserWarning)
self.module.showwarning = 23 old_showwarning = self.module.showwarning
try: self.module.showwarning = 23
self.assertRaises(TypeError, self.module.warn, "Warning!") try:
finally: self.assertRaises(TypeError, self.module.warn, "Warning!")
self.module.showwarning = old_showwarning finally:
self.module.resetwarnings() self.module.showwarning = old_showwarning
def test_show_warning_output(self): def test_show_warning_output(self):
# With showarning() missing, make sure that output is okay. # With showarning() missing, make sure that output is okay.
......
...@@ -730,6 +730,8 @@ Extension Modules ...@@ -730,6 +730,8 @@ Extension Modules
Tests Tests
----- -----
- Fix test_warnings to no longer reset the warnings filter.
- Fix test_logging to no longer reset the warnings filter. - Fix test_logging to no longer reset the warnings filter.
- Issue #5635: Fix running test_sys with tracing enabled. - Issue #5635: Fix running test_sys with tracing enabled.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment