Fix overriding of target queue for singly-enqueued tasks

This was a regression in v4.3.0.

Author: PeterJCLaw

django_lightweight_queue/task.py

@@ -179,11 +179,10 @@ def _enqueue_job_instances(
         get_backend(queue).bulk_enqueue(new_jobs, queue)
 
     def __call__(self, *args: Any, **kwargs: Any) -> None:
-        job = self._build_job(args, kwargs)
-
         # Allow queue overrides, but you must ensure that this queue will exist
         queue = kwargs.pop('django_lightweight_queue_queue', self.queue)
 
+        job = self._build_job(args, kwargs)
         get_backend(queue).enqueue(job, queue)
 
     def bulk_enqueue(

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-lightweight-queue"
-version = "4.3.0"
+version = "4.3.1"
 description = "Lightweight & modular queue and cron system for Django"
 authors = ["Thread Engineering <[email protected]>"]
 license = "BSD-3-Clause"

tests/test_task.py

@@ -90,6 +90,31 @@ def test_enqueues_job(self) -> None:
             job.as_dict(),
         )
 
+    def test_enqueues_job_queue_override(self) -> None:
+        OTHER_QUEUE = QueueName('other-queue')
+        self.assertEqual(0, self.backend.length(QUEUE))
+        self.assertEqual(0, self.backend.length(OTHER_QUEUE))
+
+        dummy_task(42, django_lightweight_queue_queue=OTHER_QUEUE)
+
+        self.assertIsNone(self.backend.dequeue(QUEUE, WorkerNumber(0), 1))
+
+        job = self.backend.dequeue(OTHER_QUEUE, WorkerNumber(0), 1)
+        # Plain assert to placate mypy
+        assert job is not None, "Failed to get a job after enqueuing one"
+
+        self.assertEqual(
+            {
+                'path': 'tests.test_task.dummy_task',
+                'args': [42],
+                'kwargs': {},
+                'timeout': None,
+                'sigkill_on_stop': False,
+                'created_time': mock.ANY,
+            },
+            job.as_dict(),
+        )
+
     def test_bulk_enqueues_jobs(self) -> None:
         self.assertEqual(0, self.backend.length(QUEUE))