3 files changed, 10 insertions, 8 deletions
diff --git a/mediagoblin/celery_setup/__init__.py b/mediagoblin/celery_setup/__init__.py
index b6e35e99..e35dbce2 100644
--- a/mediagoblin/celery_setup/__init__.py
+++ b/mediagoblin/celery_setup/__init__.py
@@ -40,10 +40,6 @@ def setup_celery_from_config(app_config, global_config,
     - set_environ: if set, this will CELERY_CONFIG_MODULE to the
       settings_module
     """
-    if app_config.get('celery_setup_elsewhere') == True:
-        # Don't setup celery based on our config file.
-        return
-
     if global_config.has_key('celery'):
         celery_conf = global_config['celery']
     else:
diff --git a/mediagoblin/celery_setup/from_celery.py b/mediagoblin/celery_setup/from_celery.py
index 046aaa50..ed0a409e 100644
--- a/mediagoblin/celery_setup/from_celery.py
+++ b/mediagoblin/celery_setup/from_celery.py
@@ -23,7 +23,8 @@ from mediagoblin.celery_setup import setup_celery_from_config
 OUR_MODULENAME = __name__
 
 
-def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME):
+def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME,
+               default_conf_file='mediagoblin.ini'):
     """
     Transform this module into a celery config module by reading the
     mediagoblin config file.  Set the environment variable
@@ -36,9 +37,9 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME):
     """
     if check_environ_for_conf:
         mgoblin_conf_file = os.path.abspath(
-            os.environ.get('MEDIAGOBLIN_CONFIG', 'mediagoblin.ini'))
+            os.environ.get('MEDIAGOBLIN_CONFIG', default_conf_file))
     else:
-        mgoblin_conf_file = 'mediagoblin.ini'
+        mgoblin_conf_file = default_conf_file
 
     if not os.path.exists(mgoblin_conf_file):
         raise IOError(
@@ -48,6 +49,7 @@ def setup_self(check_environ_for_conf=True, module_name=OUR_MODULENAME):
     # this is the module that gets set up.
     os.environ['CELERY_CONFIG_MODULE'] = module_name
     app.MediaGoblinApp(mgoblin_conf_file, setup_celery=False)
+
     setup_celery_from_config(
         mg_globals.app_config, mg_globals.global_config,
         settings_module=module_name,
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