From cefc7e0dc13bea9f1d7c2d4bb3096229df2bb5c2 Mon Sep 17 00:00:00 2001 From: Ilan Steemers Date: Mon, 14 Sep 2015 16:06:18 +0200 Subject: [PATCH] Adds test for orm queued task admin --- django_q/admin.py | 2 +- django_q/tests/test_admin.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/django_q/admin.py b/django_q/admin.py index e8a725d..57f22d5 100644 --- a/django_q/admin.py +++ b/django_q/admin.py @@ -109,5 +109,5 @@ admin.site.register(Schedule, ScheduleAdmin) admin.site.register(Success, TaskAdmin) admin.site.register(Failure, FailAdmin) -if Conf.ORM: +if Conf.ORM or Conf.TESTING: admin.site.register(OrmQ, QueueAdmin) diff --git a/django_q/tests/test_admin.py b/django_q/tests/test_admin.py index a18bcdf..b82ad2f 100644 --- a/django_q/tests/test_admin.py +++ b/django_q/tests/test_admin.py @@ -4,12 +4,14 @@ from django.utils import timezone import pytest from django_q.tasks import schedule -from django_q.models import Task, Failure +from django_q.models import Task, Failure, OrmQ from django_q.humanhash import uuid +from django_q.conf import Conf @pytest.mark.django_db def test_admin_views(admin_client): + Conf.ORM='default' s = schedule('sched.test') tag = uuid() f = Task.objects.create( @@ -27,6 +29,9 @@ def test_admin_views(admin_client): started=timezone.now(), stopped=timezone.now(), success=True) + q = OrmQ.objects.create( + key='test', + payload='test') admin_urls = ( # schedule reverse('admin:django_q_schedule_changelist'), @@ -44,6 +49,11 @@ def test_admin_views(admin_client): reverse('admin:django_q_failure_change', args=(f.id,)), reverse('admin:django_q_failure_history', args=(f.id,)), reverse('admin:django_q_failure_delete', args=(f.id,)), + # orm queue + reverse('admin:django_q_ormq_changelist'), + reverse('admin:django_q_ormq_change', args=(q.id,)), + reverse('admin:django_q_ormq_history', args=(q.id,)), + reverse('admin:django_q_ormq_delete', args=(q.id,)), ) for url in admin_urls: @@ -57,3 +67,6 @@ def test_admin_views(admin_client): response = admin_client.post(url, data) assert response.status_code == 302 assert Failure.objects.filter(name=f.id).exists() is False + # cleanup + q.delete() + Conf.ORM = None