fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-05 10:28:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix async_task timeout parameter handling when cluster timeout is set to None (the default)

Browse Source 
The cluster timeout configuration default value None is documented to mean
tasks never timeout out. Also the documentation states that the timeout
can be overridden for individual tasks.

With the old implementation the timeout parameter given to async_task was
not honored if the cluster timeout was set to None.

Fixes: #335
This commit is contained in:
Janne Rönkkö
2019-01-27 19:09:22 +02:00
parent 2650659da9
commit 0e2df88d92
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/tests/test_cluster.py
+2
View File
@@ -247,6 +247,7 @@ def test_enqueue(broker, admin_user):
@pytest.mark.parametrize('cluster_config_timeout, async_task_kwargs', (
(1, {}),
(10, {'timeout': 1}),
(None, {'timeout': 1}),
))
def test_timeout(broker, cluster_config_timeout, async_task_kwargs):
# set up the Sentinel
@@ -269,6 +270,7 @@ def test_timeout(broker, cluster_config_timeout, async_task_kwargs):
(5, {}),
(10, {'timeout': 5}),
(1, {'timeout': 5}),
(None, {'timeout': 5}),
))
def test_timeout_task_finishes(broker, cluster_config_timeout, async_task_kwargs):
# set up the Sentinel