summaryrefslogtreecommitdiff
path: root/tests/logging_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-01-13 19:02:39 -0500
committerTim Graham <timograham@gmail.com>2016-01-14 09:05:43 -0500
commit5b94b17feff15a9f0345f92fc0568bfe7038e3a3 (patch)
treec1dba0a0e0a3eba2ed687e04187dc4b70cae10a6 /tests/logging_tests
parent28acc0d6df844ccfc8de6f4e7d5883eb4841e946 (diff)
downloaddjango-5b94b17feff15a9f0345f92fc0568bfe7038e3a3.tar.gz
Fixed #25999 -- Removed promotion of RemovedInNextVersionWarning to loud by default.
Diffstat (limited to 'tests/logging_tests')
-rw-r--r--tests/logging_tests/tests.py31
1 files changed, 0 insertions, 31 deletions
diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py
index 6cba5942b1..8864786f28 100644
--- a/tests/logging_tests/tests.py
+++ b/tests/logging_tests/tests.py
@@ -12,12 +12,10 @@ from django.core.files.temp import NamedTemporaryFile
from django.test import RequestFactory, SimpleTestCase, override_settings
from django.test.utils import LoggingCaptureMixin, patch_logger
from django.utils.deprecation import RemovedInNextVersionWarning
-from django.utils.encoding import force_text
from django.utils.log import (
DEFAULT_LOGGING, AdminEmailHandler, CallbackFilter, RequireDebugFalse,
RequireDebugTrue,
)
-from django.utils.six import StringIO
from .logconfig import MyEmailBackend
@@ -121,40 +119,11 @@ class WarningLoggerTests(SimpleTestCase):
self._old_capture_state = bool(getattr(logging, '_warnings_showwarning', False))
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
- self.logger = logging.getLogger('py.warnings')
- self.outputs = []
- self.old_streams = []
- for handler in self.logger.handlers:
- self.old_streams.append(handler.stream)
- self.outputs.append(StringIO())
- handler.stream = self.outputs[-1]
-
def tearDown(self):
- for i, handler in enumerate(self.logger.handlers):
- self.logger.handlers[i].stream = self.old_streams[i]
-
# Reset warnings state.
logging.captureWarnings(self._old_capture_state)
@override_settings(DEBUG=True)
- def test_warnings_capture(self):
- with warnings.catch_warnings():
- warnings.filterwarnings('always')
- warnings.warn('Foo Deprecated', RemovedInNextVersionWarning)
- output = force_text(self.outputs[0].getvalue())
- self.assertIn('Foo Deprecated', output)
-
- def test_warnings_capture_debug_false(self):
- with warnings.catch_warnings():
- warnings.filterwarnings('always')
- warnings.warn('Foo Deprecated', RemovedInNextVersionWarning)
- output = force_text(self.outputs[0].getvalue())
- self.assertNotIn('Foo Deprecated', output)
-
- @override_settings(DEBUG=True)
def test_error_filter_still_raises(self):
with warnings.catch_warnings():
warnings.filterwarnings(