diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-12 15:55:59 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-05-12 15:55:59 -0500 |
| commit | a98c95b41d08033f0539d19dfad10fb13a83d42d (patch) | |
| tree | 3fbdf64209a13eaf5302a9e2abec054019655e57 /mediagoblin/init/celery | |
| parent | 814554743708c567e40b86bc88b96633eef32ace (diff) | |
| download | mediagoblin-a98c95b41d08033f0539d19dfad10fb13a83d42d.tar.lz mediagoblin-a98c95b41d08033f0539d19dfad10fb13a83d42d.tar.xz mediagoblin-a98c95b41d08033f0539d19dfad10fb13a83d42d.zip | |
Tests should no longer use the environment-variable-related-setup and set up in app instead
This should remove a bunch of confusing cruft. I hate using that
environment variable! Also that old code was fragile.
This commit sponsored by Stephen Milton. Thanks!
Diffstat (limited to 'mediagoblin/init/celery')
| -rw-r--r-- | mediagoblin/init/celery/from_tests.py | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mediagoblin/init/celery/from_tests.py b/mediagoblin/init/celery/from_tests.py deleted file mode 100644 index 3149e1ba..00000000 --- a/mediagoblin/init/celery/from_tests.py +++ /dev/null @@ -1,33 +0,0 @@ -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -import os - -from mediagoblin.tests.tools import TEST_APP_CONFIG -from mediagoblin.init.celery.from_celery import setup_self - - -OUR_MODULENAME = __name__ -CELERY_SETUP = False - - -if os.environ.get('CELERY_CONFIG_MODULE') == OUR_MODULENAME: - 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 |