summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Tracey <kmtracey@gmail.com>2010-04-14 18:17:44 +0000
committerKaren Tracey <kmtracey@gmail.com>2010-04-14 18:17:44 +0000
commitd8910e95e02f3eae279691e33c0ad1a2442676a0 (patch)
tree17b50fe0a56849c313f474f5f5049b607228f40f
parente93f56b174b6105943b68dfc3d2b81ccdc3c364a (diff)
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
-rwxr-xr-xtests/runtests.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/runtests.py b/tests/runtests.py
index 81b4424d3f..b4e0f581be 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -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)
REGRESSION_TEST_DIR = os.path.join(os.path.dirname(__file__), REGRESSION_TESTS_DIR_NAME)
+REGRESSION_SUBDIRS_TO_SKIP = ['locale']
+
ALWAYS_INSTALLED_APPS = [
'django.contrib.contenttypes',
'django.contrib.auth',
@@ -37,7 +39,9 @@ def get_test_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 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
models.append((loc, f))
return models