From fb8fd535c0f47cffb4da0c5900f3f66e1ec8d432 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Wed, 14 Mar 2018 09:38:16 -0400 Subject: [PATCH] Moved SchemaLoggingTest to tests/schema. --- tests/logging_tests/tests.py | 21 --------------------- tests/schema/test_logging.py | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) create mode 100644 tests/schema/test_logging.py diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index d2eecb9450f..8b2b093339d 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -8,7 +8,6 @@ from django.conf import settings from django.core import mail from django.core.files.temp import NamedTemporaryFile from django.core.management import color -from django.db import connection from django.test import RequestFactory, SimpleTestCase, override_settings from django.test.utils import LoggingCaptureMixin, patch_logger from django.utils.log import ( @@ -463,26 +462,6 @@ format=%(message)s self.assertOutput(out, "System check identified no issues (0 silenced).") -class SchemaLoggerTests(SimpleTestCase): - - def test_extra_args(self): - editor = connection.schema_editor(collect_sql=True) - sql = "SELECT * FROM foo WHERE id in (%s, %s)" - params = [42, 1337] - with patch_logger('django.db.backends.schema', 'debug', log_kwargs=True) as logger: - editor.execute(sql, params) - self.assertEqual( - logger, - [( - 'SELECT * FROM foo WHERE id in (%s, %s); (params [42, 1337])', - {'extra': { - 'sql': 'SELECT * FROM foo WHERE id in (%s, %s)', - 'params': [42, 1337], - }}, - )] - ) - - class LogFormattersTests(SimpleTestCase): def test_server_formatter_styles(self): diff --git a/tests/schema/test_logging.py b/tests/schema/test_logging.py new file mode 100644 index 00000000000..8c7313abb14 --- /dev/null +++ b/tests/schema/test_logging.py @@ -0,0 +1,20 @@ +from django.db import connection +from django.test import SimpleTestCase +from django.test.utils import patch_logger + + +class SchemaLoggerTests(SimpleTestCase): + + def test_extra_args(self): + editor = connection.schema_editor(collect_sql=True) + sql = 'SELECT * FROM foo WHERE id in (%s, %s)' + params = [42, 1337] + with patch_logger('django.db.backends.schema', 'debug', log_kwargs=True) as logger: + editor.execute(sql, params) + self.assertEqual( + logger, + [( + 'SELECT * FROM foo WHERE id in (%s, %s); (params [42, 1337])', + {'extra': {'sql': sql, 'params': params}}, + )] + )