mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00
Code Issues Releases Wiki Activity

Merge pull request #968 from jacobian/fix-warning-log-regression

Browse Source 
Fixed logging-related test failure introduced by e79b857.
This commit is contained in:
Jacob Kaplan-Moss 2013-03-27 10:20:00 -07:00
commit 15c3906eeb
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/logging_tests/tests.py
View File

@ -93,6 +93,12 @@ class WarningLoggerTests(TestCase):
and captured to the logging system and captured to the logging system
""" """
def setUp(self): def setUp(self):
# If tests are invoke with "-Wall" (or any -W flag actually) then
# warning logging gets disabled (see django/conf/__init__.py). However,
# these tests expect warnings to be logged, so manually force warnings
# to the logs.
logging.captureWarnings(True)
# 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
# to be displayed at the global py.warnings level # to be displayed at the global py.warnings level
@ -108,6 +114,9 @@ class WarningLoggerTests(TestCase):
for i, handler in enumerate(self.logger.handlers): for i, handler in enumerate(self.logger.handlers):
self.logger.handlers[i].stream = self.old_streams[i] self.logger.handlers[i].stream = self.old_streams[i]
# Reset warnings state.
logging.captureWarnings(False)
@override_settings(DEBUG=True) @override_settings(DEBUG=True)
def test_warnings_capture(self): def test_warnings_capture(self):
warnings.warn('Foo Deprecated', DeprecationWarning) warnings.warn('Foo Deprecated', DeprecationWarning)