summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-09-05 20:00:33 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-09-06 09:18:02 +0200
commit79c3f226dd6e6a4dd27173d08b024bf756ea6e39 (patch)
treeb669f4339b5e1a3a42e9e76b8e5759fdf04d59b1
parent5ace1887f2b2a467bd7e11997ca64e400c652493 (diff)
Fixed #25357 -- Database deduplication on Oracle.
In order to reuse another database, Django must use set_as_test_mirror.
-rw-r--r--django/test/runner.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/django/test/runner.py b/django/test/runner.py
index 8908207c04..afcc85783c 100644
--- a/django/test/runner.py
+++ b/django/test/runner.py
@@ -377,22 +377,23 @@ def setup_databases(verbosity, interactive, keepdb=False, debug_sql=False, **kwa
mirrors = []
for signature, (db_name, aliases) in test_databases.items():
- test_db_name = None
+ first_alias = None
# Actually create the database for the first connection
for alias in aliases:
connection = connections[alias]
- if test_db_name is None:
- test_db_name = connection.creation.create_test_db(
+ old_names.append((connection, db_name, first_alias is None))
+
+ if first_alias is None:
+ first_alias = alias
+ connection.creation.create_test_db(
verbosity,
autoclobber=not interactive,
keepdb=keepdb,
serialize=connection.settings_dict.get("TEST", {}).get("SERIALIZE", True),
)
- destroy = True
else:
- connection.settings_dict['NAME'] = test_db_name
- destroy = False
- old_names.append((connection, db_name, destroy))
+ connections[alias].creation.set_as_test_mirror(
+ connections[first_alias].settings_dict)
for alias, mirror_alias in mirrored_aliases.items():
mirrors.append((alias, connections[alias].settings_dict['NAME']))