diff options
| author | Chris Moylan <chris@chrismoylan.com> | 2011-06-28 23:05:03 -0500 |
|---|---|---|
| committer | Chris Moylan <chris@chrismoylan.com> | 2011-06-28 23:05:03 -0500 |
| commit | 4ce57ac85df5dcb782eac76e8919cbd74c720458 (patch) | |
| tree | 842e58e157441f888cab92fb456d40037b9d27d8 /mediagoblin/celery_setup/from_tests.py | |
| parent | 0a78be3e08b93094f979202f56093ac7d1424cfc (diff) | |
| parent | b0d835fcd0f46025eee6c839e9bf26f513543898 (diff) | |
| download | mediagoblin-4ce57ac85df5dcb782eac76e8919cbd74c720458.tar.lz mediagoblin-4ce57ac85df5dcb782eac76e8919cbd74c720458.tar.xz mediagoblin-4ce57ac85df5dcb782eac76e8919cbd74c720458.zip | |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/celery_setup/from_tests.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mediagoblin/celery_setup/from_tests.py b/mediagoblin/celery_setup/from_tests.py index 43032f41..0f305df2 100644 --- a/mediagoblin/celery_setup/from_tests.py +++ b/mediagoblin/celery_setup/from_tests.py @@ -16,11 +16,15 @@ import os +from mediagoblin.tests.tools import TEST_APP_CONFIG from mediagoblin.celery_setup.from_celery import setup_self OUR_MODULENAME = __name__ +CELERY_SETUP = False if os.environ.get('CELERY_CONFIG_MODULE') == OUR_MODULENAME: - setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME) + setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME, + default_conf_file=TEST_APP_CONFIG) + CELERY_SETUP = True |