mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-15 08:29:11 +00:00
Code Issues 32 Releases Wiki Activity

[1.9.x] Fixed #25647 -- Reverted "Simplified deduplication of test databases."

Browse Source 
This reverts commit 49eee84245b1297a84ad4ddc2251e287ef585ea2 as it caused
a regression with test mirrors.

Backport of ce737ac67845da9a73ad645d6b9fb1692390ad56 from master
This commit is contained in:
Tim Graham 2015-11-13 11:21:10 -05:00
parent f7df398436
commit 8a03102f42
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
django/test/runner.py
View File

@ -657,16 +657,19 @@ def partition_suite_by_case(suite):
return groups return groups
def get_unique_databases(): def get_unique_databases_and_mirrors():
""" """
Figure out which databases actually need to be created. Figure out which databases actually need to be created.
Deduplicate entries in DATABASES that correspond the same database or are Deduplicate entries in DATABASES that correspond the same database or are
configured as test mirrors. configured as test mirrors.
Returns an ordered mapping of signatures to (name, list of aliases) Return two values:
where all aliases share the same unerlying database. - test_databases: ordered mapping of signatures to (name, list of aliases)
where all aliases share the same underlying database.
- mirrored_aliases: mapping of mirror aliases to original aliases.
""" """
mirrored_aliases = {}
test_databases = {} test_databases = {}
dependencies = {} dependencies = {}
default_sig = connections[DEFAULT_DB_ALIAS].creation.test_db_signature() default_sig = connections[DEFAULT_DB_ALIAS].creation.test_db_signature()
@ -676,34 +679,34 @@ def get_unique_databases():
test_settings = connection.settings_dict['TEST'] test_settings = connection.settings_dict['TEST']
if test_settings['MIRROR']: if test_settings['MIRROR']:
target = test_settings['MIRROR'] # If the database is marked as a test mirror, save the alias.
signature = connections[target].creation.test_db_signature() mirrored_aliases[alias] = test_settings['MIRROR']
else: else:
signature = connection.creation.test_db_signature() # Store a tuple with DB parameters that uniquely identify it.
# If we have two aliases with the same values for that tuple,
# we only need to create the test database once.
item = test_databases.setdefault(
connection.creation.test_db_signature(),
(connection.settings_dict['NAME'], set())
)
item[1].add(alias)
if 'DEPENDENCIES' in test_settings: if 'DEPENDENCIES' in test_settings:
dependencies[alias] = test_settings['DEPENDENCIES'] dependencies[alias] = test_settings['DEPENDENCIES']
elif alias != DEFAULT_DB_ALIAS and signature != default_sig: else:
dependencies[alias] = test_settings.get('DEPENDENCIES', [DEFAULT_DB_ALIAS]) if alias != DEFAULT_DB_ALIAS and connection.creation.test_db_signature() != default_sig:
dependencies[alias] = test_settings.get('DEPENDENCIES', [DEFAULT_DB_ALIAS])
# Store a tuple with DB parameters that uniquely identify it.
# If we have two aliases with the same values for that tuple,
# we only need to create the test database once.
item = test_databases.setdefault(
signature, (connection.settings_dict['NAME'], set()))
item[1].add(alias)
test_databases = dependency_ordered(test_databases.items(), dependencies) test_databases = dependency_ordered(test_databases.items(), dependencies)
test_databases = collections.OrderedDict(test_databases) test_databases = collections.OrderedDict(test_databases)
return test_databases return test_databases, mirrored_aliases
def setup_databases(verbosity, interactive, keepdb=False, debug_sql=False, parallel=0, **kwargs): def setup_databases(verbosity, interactive, keepdb=False, debug_sql=False, parallel=0, **kwargs):
""" """
Creates the test databases. Creates the test databases.
""" """
test_databases = get_unique_databases() test_databases, mirrored_aliases = get_unique_databases_and_mirrors()
old_names = [] old_names = []
@ -734,6 +737,11 @@ def setup_databases(verbosity, interactive, keepdb=False, debug_sql=False, paral
connections[alias].creation.set_as_test_mirror( connections[alias].creation.set_as_test_mirror(
connections[first_alias].settings_dict) connections[first_alias].settings_dict)
# Configure the test mirrors.
for alias, mirror_alias in mirrored_aliases.items():
connections[alias].creation.set_as_test_mirror(
connections[mirror_alias].settings_dict)
if debug_sql: if debug_sql:
for alias in connections: for alias in connections:
connections[alias].force_debug_cursor = True connections[alias].force_debug_cursor = True