summaryrefslogtreecommitdiff
path: root/django/test
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-04 19:58:58 -0400
committerTim Graham <timograham@gmail.com>2013-07-04 19:58:58 -0400
commit2cbd579efe2d646814bd6cb7aca8bd43a96f14ae (patch)
tree596b4704f44ddd7f47d3bc975a65d16ba1ff3528 /django/test
parentda5069f68f9ec0cf80f50f6708d103afd56d23ae (diff)
Fixed #19940 -- Made test.runner.setup_databases properly handle aliases for default db.
Thanks simonpercivall.
Diffstat (limited to 'django/test')
-rw-r--r--django/test/runner.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/test/runner.py b/django/test/runner.py
index 709b685de5..98113e9b67 100644
--- a/django/test/runner.py
+++ b/django/test/runner.py
@@ -238,6 +238,7 @@ def setup_databases(verbosity, interactive, **kwargs):
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']:
@@ -259,7 +260,7 @@ def setup_databases(verbosity, interactive, **kwargs):
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])