Commit 9a41045b authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.5.x] Fixed logging-related test failure introduced by e79b857a.

Backport of 654d8e96.
parent 87f48607
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -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)