From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 30 Jun 2011 21:57:55 +0000 (-0500)
Subject: Actually make use of CELERY_SETUP in from_tests.py
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=90828d9d8daedc77b9360a74b1783f9143e3ffed;p=mediagoblin.git

Actually make use of CELERY_SETUP in from_tests.py
---

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