diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-07-01 22:02:58 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-07-01 22:02:58 +0200 |
| commit | fe5f8a281a3cd5d2e449866caaa410b06e488588 (patch) | |
| tree | 5adc956eeaae6b86fa36100b710ca361d6fe4da4 /mediagoblin/celery_setup/from_tests.py | |
| parent | 40d18ad4c6d66d6db1aaf43df8d6ba23d162f77f (diff) | |
| parent | 0e3400357d55caf9099f4288ce8aef90eff7867c (diff) | |
| download | mediagoblin-fe5f8a281a3cd5d2e449866caaa410b06e488588.tar.lz mediagoblin-fe5f8a281a3cd5d2e449866caaa410b06e488588.tar.xz mediagoblin-fe5f8a281a3cd5d2e449866caaa410b06e488588.zip | |
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
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 |