mirror of https://github.com/django/django.git
[1.5.x] Fixed logging-related test failure introduced by e79b857
.
Backport of 654d8e9
.
This commit is contained in:
parent
87f4860718
commit
9a41045b77
|
@ -142,6 +142,12 @@ class WarningLoggerTests(TestCase):
|
|||
and captured to the logging system
|
||||
"""
|
||||
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
|
||||
# stderr during test running - as the test runner forces deprecations
|
||||
# to be displayed at the global py.warnings level
|
||||
|
@ -157,6 +163,9 @@ class WarningLoggerTests(TestCase):
|
|||
for i, handler in enumerate(self.logger.handlers):
|
||||
self.logger.handlers[i].stream = self.old_streams[i]
|
||||
|
||||
# Reset warnings state.
|
||||
logging.captureWarnings(False)
|
||||
|
||||
@override_settings(DEBUG=True)
|
||||
def test_warnings_capture(self):
|
||||
warnings.warn('Foo Deprecated', DeprecationWarning)
|
||||
|
|
Loading…
Reference in New Issue