[IMP] queue_job: use state constant in lock function

Author: sbidoul

queue_job/job.py

@@ -261,11 +261,11 @@ def lock(self) -> bool:
                         queue_job
                     WHERE
                         uuid = %s
-                        AND state='started'
+                        AND state = %s
                 )
             FOR UPDATE SKIP LOCKED;
         """,
-            [self.uuid],
+            [self.uuid, STARTED],
         )
 
         # 1 job should be locked

test_queue_job/tests/__init__.py

@@ -1,3 +1,4 @@
+from . import test_acquire_job
 from . import test_autovacuum
 from . import test_delayable
 from . import test_dependencies

test_queue_job/tests/common.py

@@ -20,3 +20,13 @@ def _create_job(self):
         stored = Job.db_records_from_uuids(self.env, [test_job.uuid])
         self.assertEqual(len(stored), 1)
         return stored
+
+    def _get_demo_job(self, uuid):
+        # job created during load of demo data
+        job = self.env["queue.job"].search([("uuid", "=", uuid)], limit=1)
+        self.assertTrue(
+            job,
+            f"Demo data queue job {uuid!r} should be loaded in order "
+            "to make this test work",
+        )
+        return job

test_queue_job/tests/test_acquire_job.py

@@ -0,0 +1,43 @@
+# Copyright 2026 ACSONE SA/NV
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from unittest import mock
+
+from odoo.tests import tagged
+
+from odoo.addons.queue_job.controllers.main import RunJobController
+
+from .common import JobCommonCase
+
+
+@tagged("post_install", "-at_install")
+class TestRequeueDeadJob(JobCommonCase):
+    def test_acquire_enqueued_job(self):
+        job_record = self._get_demo_job(uuid="test_enqueued_job")
+        self.assertFalse(
+            self.env["queue.job.lock"].search(
+                [("queue_job_id", "=", job_record.id)],
+            ),
+            "A job lock record should not exist at this point",
+        )
+        with mock.patch.object(
+            self.env.cr, "commit", mock.Mock(side_effect=self.env.flush_all)
+        ) as mock_commit:
+            job = RunJobController._acquire_job(self.env, job_uuid="test_enqueued_job")
+            mock_commit.assert_called_once()
+            self.assertIsNotNone(job)
+            self.assertEqual(job.uuid, "test_enqueued_job")
+            self.assertEqual(job.state, "started")
+            self.assertTrue(
+                self.env["queue.job.lock"].search(
+                    [("queue_job_id", "=", job_record.id)]
+                ),
+                "A job lock record should exist at this point",
+            )
+
+    def test_acquire_started_job(self):
+        with mock.patch.object(
+            self.env.cr, "commit", mock.Mock(side_effect=self.env.flush_all)
+        ) as mock_commit:
+            job = RunJobController._acquire_job(self.env, "test_started_job")
+            mock_commit.assert_not_called()
+            self.assertIsNone(job)

test_queue_job/tests/test_requeue_dead_job.py

@@ -13,23 +13,6 @@
 
 @tagged("post_install", "-at_install")
 class TestRequeueDeadJob(JobCommonCase):
-    def _get_demo_job(self, uuid):
-        # job created during load of demo data
-        job = self.env["queue.job"].search(
-            [
-                ("uuid", "=", uuid),
-            ],
-            limit=1,
-        )
-
-        self.assertTrue(
-            job,
-            f"Demo data queue job {uuid} should be loaded in order"
-            " to make this tests work",
-        )
-
-        return job
-
     def get_locks(self, uuid, cr=None):
         """
         Retrieve lock rows