Ability to override the creation of the Celery App (readthedocs#3623)

* Ability to override the creation of the Celery App

* Revert "Ability to override the creation of the Celery App"

This reverts commit d21649c.

* Use simple settings to reuse the Celery App

* Fix Django settings when running tests

Author: humitos

readthedocs/settings/base.py

@@ -231,6 +231,7 @@ def USE_PROMOS(self):  # noqa
     USE_L10N = True
 
     # Celery
+    CELERY_APP_NAME = 'readthedocs'
     CELERY_ALWAYS_EAGER = True
     CELERYD_TASK_TIME_LIMIT = 60 * 60  # 60 minutes
     CELERY_SEND_TASK_ERROR_EMAILS = False

readthedocs/worker.py

@@ -1,16 +1,22 @@
+# -*- coding: utf-8 -*-
 """Celery worker application instantiation"""
 
 from __future__ import absolute_import, unicode_literals
 
 import os
 
 from celery import Celery
+from django.conf import settings
 
 
 def create_application():
-    """Create a Celery application using Django settings"""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'readthedocs.settings.dev')
-    application = Celery('readthedocs')
+    """Create a Celery application using Django settings."""
+    os.environ.setdefault(
+        'DJANGO_SETTINGS_MODULE',
+        'readthedocs.settings.dev',
+    )
+
+    application = Celery(settings.CELERY_APP_NAME)
     application.config_from_object('django.conf:settings')
     application.autodiscover_tasks(None)
     return application

tox.ini

@@ -10,7 +10,7 @@ python =
 [testenv]
 setenv =
     PYTHONPATH={toxinidir}/readthedocs:{toxinidir}
-    DJANGO_SETTINGS_MODULE=settings.test
+    DJANGO_SETTINGS_MODULE=readthedocs.settings.test
     LANG=C
     DJANGO_SETTINGS_SKIP_LOCAL=True
 deps = -r{toxinidir}/requirements/testing.txt