aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/celery_setup/from_tests.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-06-30 16:57:55 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-06-30 16:57:55 -0500
commit90828d9d8daedc77b9360a74b1783f9143e3ffed (patch)
tree56688c9f6b0e69693aa4034ac986384b9767013b /mediagoblin/celery_setup/from_tests.py
parenta86e66b5e06c52d60c98e91da557c489e01b5ca7 (diff)
downloadmediagoblin-90828d9d8daedc77b9360a74b1783f9143e3ffed.tar.lz
mediagoblin-90828d9d8daedc77b9360a74b1783f9143e3ffed.tar.xz
mediagoblin-90828d9d8daedc77b9360a74b1783f9143e3ffed.zip
Actually make use of CELERY_SETUP in from_tests.py
Diffstat (limited to 'mediagoblin/celery_setup/from_tests.py')
-rw-r--r--mediagoblin/celery_setup/from_tests.py9
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