Django

Code

Changeset 4473

Show
Ignore:
Timestamp:
02/09/07 22:01:19 (1 year ago)
Author:
adrian
Message:

Improved runtests.py to normalize MIDDLEWARE_CLASSES during test execution. Some tests were failing for me because my custom MIDDLEWARE_CLASSES setting didn't have sessions or authentication installed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/tests/runtests.py

    r4206 r4473  
    7878    old_template_dirs = settings.TEMPLATE_DIRS 
    7979    old_use_i18n = settings.USE_I18N 
     80    old_middleware_classes = settings.MIDDLEWARE_CLASSES 
    8081 
    81     # Redirect some settings for the duration of these tests 
     82    # Redirect some settings for the duration of these tests. 
    8283    settings.TEST_DATABASE_NAME = TEST_DATABASE_NAME 
    8384    settings.INSTALLED_APPS = ALWAYS_INSTALLED_APPS 
     
    8586    settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), TEST_TEMPLATE_DIR),) 
    8687    settings.USE_I18N = True 
     88    settings.MIDDLEWARE_CLASSES = ( 
     89        'django.contrib.sessions.middleware.SessionMiddleware', 
     90        'django.contrib.auth.middleware.AuthenticationMiddleware', 
     91        'django.middleware.common.CommonMiddleware', 
     92    ) 
    8793 
    8894    # Load all the ALWAYS_INSTALLED_APPS. 
     
    9298    get_apps() 
    9399 
    94     # Load all the test model apps 
     100    # Load all the test model apps. 
    95101    test_models = [] 
    96102    for model_dir, model_name in get_test_models(): 
     
    110116            continue 
    111117 
    112     # Add tests for invalid models 
     118    # Add tests for invalid models. 
    113119    extra_tests = [] 
    114120    for model_dir, model_name in get_invalid_models(): 
     
    121127    run_tests(test_models, verbosity, extra_tests=extra_tests) 
    122128 
    123     # Restore the old settings 
     129    # Restore the old settings. 
    124130    settings.INSTALLED_APPS = old_installed_apps 
    125131    settings.TESTS_DATABASE_NAME = old_test_database_name 
     
    127133    settings.TEMPLATE_DIRS = old_template_dirs 
    128134    settings.USE_I18N = old_use_i18n 
     135    settings.MIDDLEWARE_CLASSES = old_middleware_classes 
    129136 
    130137if __name__ == "__main__":