Extra checks so that we don't even RUN tests unless the right celery environ set
This commit is contained in:
parent
26c61fc843
commit
29f1333e72
@ -16,11 +16,13 @@
|
|||||||
|
|
||||||
from mediagoblin import mg_globals
|
from mediagoblin import mg_globals
|
||||||
|
|
||||||
from mediagoblin.tests.tools import MEDIAGOBLIN_TEST_DB_NAME
|
from mediagoblin.tests.tools import (
|
||||||
|
MEDIAGOBLIN_TEST_DB_NAME, suicide_if_bad_celery_environ)
|
||||||
|
|
||||||
|
|
||||||
def setup_package():
|
def setup_package():
|
||||||
pass
|
suicide_if_bad_celery_environ()
|
||||||
|
|
||||||
|
|
||||||
def teardown_package():
|
def teardown_package():
|
||||||
if ((mg_globals.db_connection
|
if ((mg_globals.db_connection
|
||||||
|
@ -42,17 +42,23 @@ USER_DEV_DIRECTORIES_TO_SETUP = [
|
|||||||
'media/public', 'media/queue',
|
'media/public', 'media/queue',
|
||||||
'beaker/sessions/data', 'beaker/sessions/lock']
|
'beaker/sessions/data', 'beaker/sessions/lock']
|
||||||
|
|
||||||
|
BAD_CELERY_MESSAGE = """\
|
||||||
|
Sorry, you *absolutely* must run nosetests with the
|
||||||
|
mediagoblin.celery_setup.from_tests module. Like so:
|
||||||
|
$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests"""
|
||||||
|
|
||||||
|
|
||||||
class BadCeleryEnviron(Exception): pass
|
class BadCeleryEnviron(Exception): pass
|
||||||
|
|
||||||
|
|
||||||
def get_test_app(dump_old_app=True):
|
def suicide_if_bad_celery_environ():
|
||||||
if not os.environ.get('CELERY_CONFIG_MODULE') == \
|
if not os.environ.get('CELERY_CONFIG_MODULE') == \
|
||||||
'mediagoblin.celery_setup.from_tests':
|
'mediagoblin.celery_setup.from_tests':
|
||||||
raise BadCeleryEnviron(
|
raise BadCeleryEnviron(BAD_CELERY_MESSAGE)
|
||||||
u"Sorry, you *absolutely* must run nosetests with the\n"
|
|
||||||
u"mediagoblin.celery_setup.from_tests module. Like so:\n"
|
|
||||||
u"$ CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests ./bin/nosetests")
|
def get_test_app(dump_old_app=True):
|
||||||
|
suicide_if_bad_celery_environ()
|
||||||
|
|
||||||
global MGOBLIN_APP
|
global MGOBLIN_APP
|
||||||
global CELERY_SETUP
|
global CELERY_SETUP
|
||||||
|
Loading…
x
Reference in New Issue
Block a user