[1.5.x] Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for defau

Thanks simonpercivall.

Backport of 2cbd579efe from master.

2 files changed, 27 insertions, 1 deletions

diff --git a/django/test/simple.py b/django/test/simple.py
index bf0219d53f..e062f5e1e8 100644
--- a/django/test/simple.py
+++ b/django/test/simple.py
@@ -273,6 +273,7 @@ class DjangoTestSuiteRunner(object):
         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,7 +295,7 @@ class DjangoTestSuiteRunner(object):
                     dependencies[alias] = (
                         connection.settings_dict['TEST_DEPENDENCIES'])
                 else:
-                    if alias != DEFAULT_DB_ALIAS:
+                    if alias != DEFAULT_DB_ALIAS and connection.creation.test_db_signature() != default_sig:
                         dependencies[alias] = connection.settings_dict.get(
                             'TEST_DEPENDENCIES', [DEFAULT_DB_ALIAS])
 
diff --git a/tests/regressiontests/test_runner/tests.py b/tests/regressiontests/test_runner/tests.py
index b5e4a1d80a..48a8e09978 100644
--- a/tests/regressiontests/test_runner/tests.py
+++ b/tests/regressiontests/test_runner/tests.py
@@ -285,6 +285,31 @@ class DummyBackendTest(unittest.TestCase):
             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):