p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Silenced deprecation warnings for refs #22811 and fixed build.

This commit is contained in:
Tim Graham 2014-06-12 09:28:36 -04:00
parent 1c58cabad7
commit a2cd0e12c9
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/utils.py
View File

@ -210,7 +210,7 @@ class ConnectionHandler(object):
"Connection '%s' has mismatched TEST and TEST_* " "Connection '%s' has mismatched TEST and TEST_* "
"database settings." % alias) "database settings." % alias)
else: else:
test_settings = old_test_settings test_settings.update(old_test_settings)
for key, _ in six.iteritems(old_test_settings): for key, _ in six.iteritems(old_test_settings):
warnings.warn("In Django 1.9 the %s connection setting will be moved " warnings.warn("In Django 1.9 the %s connection setting will be moved "
"to a %s entry in the TEST setting" % "to a %s entry in the TEST setting" %

11
tests/backends/tests.py
View File

@ -26,7 +26,7 @@ from django.db.models.sql.constants import CURSOR
from django.db.utils import ConnectionHandler from django.db.utils import ConnectionHandler
from django.test import (TestCase, TransactionTestCase, override_settings, from django.test import (TestCase, TransactionTestCase, override_settings,
skipUnlessDBFeature, skipIfDBFeature) skipUnlessDBFeature, skipIfDBFeature)
from django.test.utils import str_prefix from django.test.utils import str_prefix, IgnoreAllDeprecationWarningsMixin
from django.utils import six from django.utils import six
from django.utils.six.moves import xrange from django.utils.six.moves import xrange
@ -1080,12 +1080,19 @@ class BackendUtilTests(TestCase):
'0') '0')
class DBTestSettingsRenamedTests(TestCase): class DBTestSettingsRenamedTests(IgnoreAllDeprecationWarningsMixin, TestCase):
mismatch_msg = ("Connection 'test-deprecation' has mismatched TEST " mismatch_msg = ("Connection 'test-deprecation' has mismatched TEST "
"and TEST_* database settings.") "and TEST_* database settings.")
@classmethod
def setUpClass(cls):
# Silence "UserWarning: Overriding setting DATABASES can lead to
# unexpected behavior."
cls.warning_classes.append(UserWarning)
def setUp(self): def setUp(self):
super(DBTestSettingsRenamedTests, self).setUp()
self.handler = ConnectionHandler() self.handler = ConnectionHandler()
self.db_settings = {'default': {}} self.db_settings = {'default': {}}