mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Fixed #13345: Don't attempt to load the locale regressiontests subdirectory as a Django app. Thanks ramiro.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e93f56b174
commit
d8910e95e0
@ -21,6 +21,8 @@ CONTRIB_DIR = os.path.dirname(contrib.__file__)
|
|||||||
MODEL_TEST_DIR = os.path.join(os.path.dirname(__file__), MODEL_TESTS_DIR_NAME)
|
MODEL_TEST_DIR = os.path.join(os.path.dirname(__file__), MODEL_TESTS_DIR_NAME)
|
||||||
REGRESSION_TEST_DIR = os.path.join(os.path.dirname(__file__), REGRESSION_TESTS_DIR_NAME)
|
REGRESSION_TEST_DIR = os.path.join(os.path.dirname(__file__), REGRESSION_TESTS_DIR_NAME)
|
||||||
|
|
||||||
|
REGRESSION_SUBDIRS_TO_SKIP = ['locale']
|
||||||
|
|
||||||
ALWAYS_INSTALLED_APPS = [
|
ALWAYS_INSTALLED_APPS = [
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
@ -37,7 +39,9 @@ def get_test_models():
|
|||||||
models = []
|
models = []
|
||||||
for loc, dirpath in (MODEL_TESTS_DIR_NAME, MODEL_TEST_DIR), (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR), (CONTRIB_DIR_NAME, CONTRIB_DIR):
|
for loc, dirpath in (MODEL_TESTS_DIR_NAME, MODEL_TEST_DIR), (REGRESSION_TESTS_DIR_NAME, REGRESSION_TEST_DIR), (CONTRIB_DIR_NAME, CONTRIB_DIR):
|
||||||
for f in os.listdir(dirpath):
|
for f in os.listdir(dirpath):
|
||||||
if f.startswith('__init__') or f.startswith('.') or f.startswith('sql') or f.startswith('invalid'):
|
if f.startswith('__init__') or f.startswith('.') or \
|
||||||
|
f.startswith('sql') or f.startswith('invalid') or \
|
||||||
|
os.path.basename(f) in REGRESSION_SUBDIRS_TO_SKIP:
|
||||||
continue
|
continue
|
||||||
models.append((loc, f))
|
models.append((loc, f))
|
||||||
return models
|
return models
|
||||||
|
Loading…
Reference in New Issue
Block a user