mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00
Code Issues 32 Releases Wiki Activity

[1.8.x] Moved contrib.flatpages tests out of contrib.

Browse Source 
Backport of d3a725054f from master
This commit is contained in:
Tim Graham
2015-02-09 19:20:39 -05:00
parent a0553d1a7c
commit 36bf6ec9eb
17 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/runtests.py
View File

@@ -60,6 +60,14 @@ ALWAYS_MIDDLEWARE_CLASSES = (
'django.contrib.messages.middleware.MessageMiddleware',
)
# Need to add the associated contrib app to INSTALLED_APPS in some cases to
# avoid "RuntimeError: Model class X doesn't declare an explicit app_label
# and either isn't in an application in INSTALLED_APPS or else was imported
# before its application was loaded."
CONTRIB_TESTS_TO_APPS = {
'flatpages_tests': 'django.contrib.flatpages',
}
def get_test_modules():
modules = []
@@ -142,6 +150,7 @@ def setup(verbosity, test_labels):
# us skip creating migrations for the test models.
'auth': 'django.contrib.auth.tests.migrations',
'contenttypes': 'django.contrib.contenttypes.tests.migrations',
'flatpages_tests': 'django.contrib.flatpages.migrations',
}
if verbosity > 0:
@@ -191,6 +200,9 @@ def setup(verbosity, test_labels):
module_label == label or module_label.startswith(label + '.')
for label in test_labels_set)
if module_name in CONTRIB_TESTS_TO_APPS and module_found_in_labels:
settings.INSTALLED_APPS.append(CONTRIB_TESTS_TO_APPS[module_name])
if module_found_in_labels and module_label not in installed_app_names:
if verbosity >= 2:
print("Importing application %s" % module_name)