diff options
| author | cfdv <caldavis@gmail.com> | 2011-06-19 17:20:23 -0500 |
|---|---|---|
| committer | cfdv <caldavis@gmail.com> | 2011-06-19 17:20:23 -0500 |
| commit | cd95cb6d3d6ffa403be5f2b347862929917aa1e3 (patch) | |
| tree | 07c7625b589437c927bc0eaa9ed4cdc27f9257d5 /mediagoblin/celery_setup/from_tests.py | |
| parent | 699b5475806c43af339d48408a7ea04ae9027c1a (diff) | |
| parent | 188240e312b8c5ff50bef276c97b36e5b3835f1e (diff) | |
| download | mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.lz mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.tar.xz mediagoblin-cd95cb6d3d6ffa403be5f2b347862929917aa1e3.zip | |
Merge remote-tracking branch 'origin/master' into is315
Diffstat (limited to 'mediagoblin/celery_setup/from_tests.py')
| -rw-r--r-- | mediagoblin/celery_setup/from_tests.py | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/mediagoblin/celery_setup/from_tests.py b/mediagoblin/celery_setup/from_tests.py index 70814075..43032f41 100644 --- a/mediagoblin/celery_setup/from_tests.py +++ b/mediagoblin/celery_setup/from_tests.py @@ -16,27 +16,11 @@ 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.celery_setup.from_celery import setup_self OUR_MODULENAME = __name__ -def setup_self(): - """ - Set up celery for testing's sake, which just needs to set up - celery and celery only. - """ - mgoblin_conf = util.read_config_file(TEST_APP_CONFIG) - mgoblin_section = mgoblin_conf['app:mediagoblin'] - - setup_celery_from_config( - mgoblin_section, mgoblin_conf, - settings_module=OUR_MODULENAME, - set_environ=False) - - if os.environ.get('CELERY_CONFIG_MODULE') == OUR_MODULENAME: - setup_self() + setup_self(check_environ_for_conf=False, module_name=OUR_MODULENAME) |