p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #24095 -- Prevented WarningLoggerTests from leaking a warnings filter.

This commit is contained in:
Tim Graham 2015-01-07 18:49:02 -05:00
parent 862ea825b5
commit ade9859996
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/logging_tests/tests.py
View File

@ -101,7 +101,6 @@ class WarningLoggerTests(TestCase):
# undocumented and (I assume) brittle. # undocumented and (I assume) brittle.
self._old_capture_state = bool(getattr(logging, '_warnings_showwarning', False)) self._old_capture_state = bool(getattr(logging, '_warnings_showwarning', False))
logging.captureWarnings(True) logging.captureWarnings(True)
warnings.filterwarnings('always')
# this convoluted setup is to avoid printing this deprecation to # this convoluted setup is to avoid printing this deprecation to
# stderr during test running - as the test runner forces deprecations # stderr during test running - as the test runner forces deprecations
@ -123,14 +122,18 @@ class WarningLoggerTests(TestCase):
@override_settings(DEBUG=True) @override_settings(DEBUG=True)
def test_warnings_capture(self): def test_warnings_capture(self):
warnings.warn('Foo Deprecated', RemovedInNextVersionWarning) with warnings.catch_warnings():
output = force_text(self.outputs[0].getvalue()) warnings.filterwarnings('always')
self.assertIn('Foo Deprecated', output) warnings.warn('Foo Deprecated', RemovedInNextVersionWarning)
output = force_text(self.outputs[0].getvalue())
self.assertIn('Foo Deprecated', output)
def test_warnings_capture_debug_false(self): def test_warnings_capture_debug_false(self):
warnings.warn('Foo Deprecated', RemovedInNextVersionWarning) with warnings.catch_warnings():
output = force_text(self.outputs[0].getvalue()) warnings.filterwarnings('always')
self.assertNotIn('Foo Deprecated', output) warnings.warn('Foo Deprecated', RemovedInNextVersionWarning)
output = force_text(self.outputs[0].getvalue())
self.assertNotIn('Foo Deprecated', output)
@override_settings(DEBUG=True) @override_settings(DEBUG=True)
def test_error_filter_still_raises(self): def test_error_filter_still_raises(self):