From e2bfcab065fef4f1c2f32195c74f054991c33151 Mon Sep 17 00:00:00 2001 From: Andrei Kulakov Date: Thu, 12 Mar 2015 12:17:15 -0400 Subject: [PATCH] Fixed #24394 -- Allowed running tests with empty default dictionary. --- django/db/backends/dummy/base.py | 4 ++-- django/db/backends/dummy/features.py | 5 +++++ django/db/utils.py | 3 +++ tests/test_runner/tests.py | 17 ++++++++++++++++- 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 django/db/backends/dummy/features.py diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py index ba8ad10210..f45d913bef 100644 --- a/django/db/backends/dummy/base.py +++ b/django/db/backends/dummy/base.py @@ -11,10 +11,10 @@ from django.core.exceptions import ImproperlyConfigured from django.db.backends.base.base import BaseDatabaseWrapper from django.db.backends.base.client import BaseDatabaseClient from django.db.backends.base.creation import BaseDatabaseCreation -from django.db.backends.base.features import BaseDatabaseFeatures from django.db.backends.base.introspection import BaseDatabaseIntrospection from django.db.backends.base.operations import BaseDatabaseOperations from django.db.backends.base.validation import BaseDatabaseValidation +from django.db.backends.dummy.features import DummyDatabaseFeatures def complain(*args, **kwargs): @@ -75,7 +75,7 @@ class DatabaseWrapper(BaseDatabaseWrapper): def __init__(self, *args, **kwargs): super(DatabaseWrapper, self).__init__(*args, **kwargs) - self.features = BaseDatabaseFeatures(self) + self.features = DummyDatabaseFeatures(self) self.ops = DatabaseOperations(self) self.client = DatabaseClient(self) self.creation = DatabaseCreation(self) diff --git a/django/db/backends/dummy/features.py b/django/db/backends/dummy/features.py new file mode 100644 index 0000000000..57a403aca7 --- /dev/null +++ b/django/db/backends/dummy/features.py @@ -0,0 +1,5 @@ +from django.db.backends.base.features import BaseDatabaseFeatures + + +class DummyDatabaseFeatures(BaseDatabaseFeatures): + supports_transactions = False diff --git a/django/db/utils.py b/django/db/utils.py index d038c20368..2fb42a7674 100644 --- a/django/db/utils.py +++ b/django/db/utils.py @@ -153,6 +153,9 @@ class ConnectionHandler(object): 'ENGINE': 'django.db.backends.dummy', }, } + if self._databases[DEFAULT_DB_ALIAS] == {}: + self._databases[DEFAULT_DB_ALIAS]['ENGINE'] = 'django.db.backends.dummy' + if DEFAULT_DB_ALIAS not in self._databases: raise ImproperlyConfigured("You must define a '%s' database" % DEFAULT_DB_ALIAS) return self._databases diff --git a/tests/test_runner/tests.py b/tests/test_runner/tests.py index 46fac052a9..a9ae782f86 100644 --- a/tests/test_runner/tests.py +++ b/tests/test_runner/tests.py @@ -13,7 +13,7 @@ from django.core.exceptions import ImproperlyConfigured from django.core.management import call_command from django.db.backends.dummy.base import DatabaseCreation from django.test import ( - TestCase, TransactionTestCase, mock, skipUnlessDBFeature, + TestCase, TransactionTestCase, mock, skipUnlessDBFeature, testcases, ) from django.test.runner import DiscoverRunner, dependency_ordered from django.test.testcases import connections_support_transactions @@ -404,3 +404,18 @@ class AutoIncrementResetTest(TransactionTestCase): def test_autoincrement_reset2(self): p = Person.objects.create(first_name='Jack', last_name='Smith') self.assertEqual(p.pk, 1) + + +class EmptyDefaultDatabaseTest(unittest.TestCase): + def test_empty_default_database(self): + """ + Test that an empty default database in settings does not raise an ImproperlyConfigured + error when running a unit test that does not use a database. + """ + testcases.connections = db.ConnectionHandler({'default': {}}) + connection = testcases.connections[db.utils.DEFAULT_DB_ALIAS] + self.assertEqual(connection.settings_dict['ENGINE'], 'django.db.backends.dummy') + try: + connections_support_transactions() + except Exception as e: + self.fail("connections_support_transactions() unexpectedly raised an error: %s" % e)