diff options
| author | Chris Moylan <chris@chrismoylan.com> | 2011-06-30 18:33:35 -0500 |
|---|---|---|
| committer | Chris Moylan <chris@chrismoylan.com> | 2011-06-30 18:33:35 -0500 |
| commit | 5e008b93f44b34078f64591f0c0ddc9205909926 (patch) | |
| tree | 729330d97e7aa9150de63d52d1975df8f5842083 /mediagoblin/celery_setup/from_tests.py | |
| parent | 75ce65cf5928a5174819f0b7992b7d95c1bc0fb0 (diff) | |
| parent | 90828d9d8daedc77b9360a74b1783f9143e3ffed (diff) | |
| download | mediagoblin-5e008b93f44b34078f64591f0c0ddc9205909926.tar.lz mediagoblin-5e008b93f44b34078f64591f0c0ddc9205909926.tar.xz mediagoblin-5e008b93f44b34078f64591f0c0ddc9205909926.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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mediagoblin/celery_setup/from_tests.py b/mediagoblin/celery_setup/from_tests.py index 0f305df2..779ecd65 100644 --- a/mediagoblin/celery_setup/from_tests.py +++ b/mediagoblin/celery_setup/from_tests.py @@ -25,6 +25,9 @@ CELERY_SETUP = False if os.environ.get('CELERY_CONFIG_MODULE') == OUR_MODULENAME: - setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME, - default_conf_file=TEST_APP_CONFIG) - CELERY_SETUP = True + if CELERY_SETUP: + pass + else: + setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME, + default_conf_file=TEST_APP_CONFIG) + CELERY_SETUP = True |