diff options
author | Tim Graham <timograham@gmail.com> | 2015-03-23 18:17:43 -0400 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-04-24 11:07:42 -0400 |
commit | 8efea1b8d5b5fb0cfef1a3244c339cebf8af36c5 (patch) | |
tree | 31d7ef33be2de88e47d2f6a1e698d210dd09baa2 /tests/logging_tests | |
parent | 37682368a604e08f3135375c85529e566492a352 (diff) | |
download | django-8efea1b8d5b5fb0cfef1a3244c339cebf8af36c5.tar.gz |
Fixed #24526 -- Combined django.request/security loggers with the root logger.
Thanks Carl Meyer for review.
Diffstat (limited to 'tests/logging_tests')
-rw-r--r-- | tests/logging_tests/tests.py | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index a349e4f35b..5ee1092c41 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -9,7 +9,7 @@ from admin_scripts.tests import AdminScriptTestCase from django.core import mail from django.core.files.temp import NamedTemporaryFile from django.test import RequestFactory, TestCase, override_settings -from django.test.utils import patch_logger +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 ( @@ -65,26 +65,18 @@ class LoggingFiltersTest(TestCase): self.assertEqual(filter_.filter("record is not used"), False) -class DefaultLoggingTest(TestCase): - def setUp(self): - self.logger = logging.getLogger('django') - self.old_stream = self.logger.handlers[0].stream - - def tearDown(self): - self.logger.handlers[0].stream = self.old_stream +class DefaultLoggingTest(LoggingCaptureMixin, TestCase): def test_django_logger(self): """ The 'django' base logger only output anything when DEBUG=True. """ - output = StringIO() - self.logger.handlers[0].stream = output self.logger.error("Hey, this is an error.") - self.assertEqual(output.getvalue(), '') + self.assertEqual(self.logger_output.getvalue(), '') with self.settings(DEBUG=True): self.logger.error("Hey, this is an error.") - self.assertEqual(output.getvalue(), 'Hey, this is an error.\n') + self.assertEqual(self.logger_output.getvalue(), 'Hey, this is an error.\n') class WarningLoggerTests(TestCase): @@ -167,11 +159,10 @@ class CallbackFilterTest(TestCase): class AdminEmailHandlerTest(TestCase): - logger = logging.getLogger('django.request') + logger = logging.getLogger('django') def get_admin_email_handler(self, logger): - # Inspired from views/views.py: send_log() - # ensuring the AdminEmailHandler does not get filtered out + # Ensure that AdminEmailHandler does not get filtered out # even with DEBUG=True. admin_email_handler = [ h for h in logger.handlers |