diff --git a/django_q/tests/settings.py b/django_q/tests/settings.py index a62b93e..5717601 100644 --- a/django_q/tests/settings.py +++ b/django_q/tests/settings.py @@ -103,4 +103,6 @@ LOGGING = { STATIC_URL = '/static/' # Django Q specific -Q_CLUSTER = {'name': 'django_q_test'} +Q_CLUSTER = {'name': 'django_q_test', + 'timeout': 60, + 'recycle': 100} diff --git a/django_q/tests/test_admin.py b/django_q/tests/test_admin.py index e97d6f0..3c59acd 100644 --- a/django_q/tests/test_admin.py +++ b/django_q/tests/test_admin.py @@ -1,6 +1,6 @@ from django.core.urlresolvers import reverse + from django.utils import timezone -from future.types.newstr import unicode import pytest diff --git a/django_q/tests/test_cluster.py b/django_q/tests/test_cluster.py index 50d3ae8..56108c0 100644 --- a/django_q/tests/test_cluster.py +++ b/django_q/tests/test_cluster.py @@ -106,8 +106,8 @@ def test_async(r): f = async(multiply, 753, 2, hook=assert_result, list_key=list_key) # model as argument g = async('django_q.tests.tasks.get_task_name', Task(name='John'), list_key=list_key) - # args and kwargs - h = async('django_q.tests.tasks.word_multiply', 2, word='django', list_key=list_key, redis=r) + # args and kwargs and broken hook + h = async('django_q.tests.tasks.word_multiply', 2, word='django', hook='fail.me', list_key=list_key, redis=r) # check if everything has a task name assert isinstance(a, str) assert isinstance(b, str)