Ticket #19940: setup_databases.patch

django/test/simple.py

@@ -273 +273 @@
         mirrored_aliases = {}
         test_databases = {}
         dependencies = {}
+        default_sig = connections[DEFAULT_DB_ALIAS].creation.test_db_signature()
         for alias in connections:
             connection = connections[alias]
             if connection.settings_dict['TEST_MIRROR']:
@@ -294 +295 @@
                     dependencies[alias] = (
                         connection.settings_dict['TEST_DEPENDENCIES'])
                 else:
-                    if alias != DEFAULT_DB_ALIAS:
+                    if alias != DEFAULT_DB_ALIAS and not connection.creation.test_db_signature() == default_sig:
                         dependencies[alias] = connection.settings_dict.get(
                             'TEST_DEPENDENCIES', [DEFAULT_DB_ALIAS])
 

tests/regressiontests/test_runner/tests.py

@@ -285 +285 @@
             db.connections = old_db_connections
 
 
+class AliasedDefaultTestSetupTest(unittest.TestCase):
+    def test_setup_aliased_default_database(self):
+        """
+        Test that setup_datebases() doesn't fail when 'default' is aliased
+        """
+        runner = DjangoTestSuiteRunner(verbosity=0)
+        old_db_connections = db.connections
+        try:
+            db.connections = db.ConnectionHandler({
+                'default': {
+                    'NAME': 'dummy'
+                },
+                'aliased': {
+                    'NAME': 'dummy'
+                }
+            })
+            old_config = runner.setup_databases()
+            runner.teardown_databases(old_config)
+        except Exception as e:
+            self.fail("setup_databases/teardown_databases unexpectedly raised "
+                      "an error: %s" % e)
+        finally:
+            db.connections = old_db_connections
+
+
 class DeprecationDisplayTest(AdminScriptTestCase):
     # tests for 19546
     def setUp(self):