aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/celery_setup/from_tests.py
diff options
context:
space:
mode:
authorJef van Schendel <jefvanschendel@gmail.com>2011-06-15 23:25:47 +0200
committerJef van Schendel <jefvanschendel@gmail.com>2011-06-15 23:25:47 +0200
commitbb770e295cd727429df524b0a5c3952ea449fdb2 (patch)
treee8a894c2a75e7ff53946b05508f82b501c37189e /mediagoblin/celery_setup/from_tests.py
parentbb10e5bef7ae062424b4c334a73c4ce988e37ccf (diff)
parent0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff)
downloadmediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.lz
mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.xz
mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.zip
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/celery_setup/from_tests.py')
-rw-r--r--mediagoblin/celery_setup/from_tests.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/mediagoblin/celery_setup/from_tests.py b/mediagoblin/celery_setup/from_tests.py
index fe7d7314..70814075 100644
--- a/mediagoblin/celery_setup/from_tests.py
+++ b/mediagoblin/celery_setup/from_tests.py
@@ -19,13 +19,12 @@ import os
from mediagoblin.tests.tools import TEST_APP_CONFIG
from mediagoblin import util
from mediagoblin.celery_setup import setup_celery_from_config
-from mediagoblin.globals import setup_globals
-OUR_MODULENAME = 'mediagoblin.celery_setup.from_tests'
+OUR_MODULENAME = __name__
-def setup_self(setup_globals_func=setup_globals):
+def setup_self():
"""
Set up celery for testing's sake, which just needs to set up
celery and celery only.