From be0531ec30c7686c41900dd9849e883b95f51a65 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 22 Nov 2015 14:31:04 +0100 Subject: [PATCH] Add test for gnuviechadmin.celery This commit adds a refactoring for gnuviechadmin.celery to make the installed apps detection testable. The test is added in gnuviechadmin.tests.test_celery. Debug code in gnuviechadmin.urls is no excluded from coverage reporting. --- gnuviechadmin/gnuviechadmin/celery.py | 5 ++++- gnuviechadmin/gnuviechadmin/tests/test_celery.py | 10 ++++++++++ gnuviechadmin/gnuviechadmin/urls.py | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 gnuviechadmin/gnuviechadmin/tests/test_celery.py diff --git a/gnuviechadmin/gnuviechadmin/celery.py b/gnuviechadmin/gnuviechadmin/celery.py index b8be2e5..285c2f6 100644 --- a/gnuviechadmin/gnuviechadmin/celery.py +++ b/gnuviechadmin/gnuviechadmin/celery.py @@ -12,5 +12,8 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', app = Celery('gnuviechadmin') +def get_installed_apps(): + return settings.INSTALLED_APPS + app.config_from_object('django.conf:settings') -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) +app.autodiscover_tasks(get_installed_apps) diff --git a/gnuviechadmin/gnuviechadmin/tests/test_celery.py b/gnuviechadmin/gnuviechadmin/tests/test_celery.py new file mode 100644 index 0000000..3dd9795 --- /dev/null +++ b/gnuviechadmin/gnuviechadmin/tests/test_celery.py @@ -0,0 +1,10 @@ +from unittest import TestCase + +from gnuviechadmin.celery import get_installed_apps +from django.conf import settings + + +class GetInstalledAppsTest(TestCase): + + def test_get_installed_apps(self): + self.assertEqual(get_installed_apps(), settings.INSTALLED_APPS) diff --git a/gnuviechadmin/gnuviechadmin/urls.py b/gnuviechadmin/gnuviechadmin/urls.py index 7d1f972..762d675 100644 --- a/gnuviechadmin/gnuviechadmin/urls.py +++ b/gnuviechadmin/gnuviechadmin/urls.py @@ -27,7 +27,7 @@ urlpatterns += patterns( # Uncomment the next line to serve media files in dev. # urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) -if settings.DEBUG: +if settings.DEBUG: # pragma: no cover import debug_toolbar urlpatterns += patterns('', url(r'^__debug__/', include(debug_toolbar.urls)),