Commit 231e452f authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.1.X] Fixed #13345: Don't attempt to load the locale regressiontests... 

[1.1.X] Fixed #13345: Don't attempt to load the locale regressiontests subdirectory as a Django app. Thanks ramiro. 
r12971 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12987 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8092d3b2

tests/runtests.py

+5 −1
Original line number Diff line number Diff line
@@ -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',
@@ -36,7 +38,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