summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-13 17:46:05 -0400
committerTim Graham <timograham@gmail.com>2013-07-13 17:46:05 -0400
commitd9c580306c4b7da49d7fd2fd1ea0e6333a784113 (patch)
tree93f39526da961238f9307eee76ac3796345dafbc /django
parent1b142ef5dd7a6e5a21abf43d4d21846c9f1eb794 (diff)
Fixed #20681 -- Prevented teardown_databases from attempting to tear down aliases
Thanks simonpercivall.
Diffstat (limited to 'django')
-rw-r--r--django/test/runner.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/test/runner.py b/django/test/runner.py
index 98113e9b67..84fe2499f1 100644
--- a/django/test/runner.py
+++ b/django/test/runner.py
@@ -272,15 +272,16 @@ def setup_databases(verbosity, interactive, **kwargs):
test_databases.items(), dependencies):
test_db_name = None
# Actually create the database for the first connection
-
for alias in aliases:
connection = connections[alias]
- old_names.append((connection, db_name, True))
if test_db_name is None:
test_db_name = connection.creation.create_test_db(
verbosity, autoclobber=not interactive)
+ destroy = True
else:
connection.settings_dict['NAME'] = test_db_name
+ destroy = False
+ old_names.append((connection, db_name, destroy))
for alias, mirror_alias in mirrored_aliases.items():
mirrors.append((alias, connections[alias].settings_dict['NAME']))