From 44c0d9fa95b48b9ba44b338c1506d14071eef504 Mon Sep 17 00:00:00 2001 From: bosd Date: Fri, 15 Aug 2025 15:35:22 +0200 Subject: [PATCH 1/2] [18.0][FIX] queue_job: Remove deprecated @api.private decorator --- queue_job/models/queue_job.py | 1 - 1 file changed, 1 deletion(-) diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py index 4be3820ad6..d110c37c02 100644 --- a/queue_job/models/queue_job.py +++ b/queue_job/models/queue_job.py @@ -235,7 +235,6 @@ def _compute_graph_jobs_count(self): record.graph_jobs_count = count_per_graph_uuid.get(record.graph_uuid) or 0 @api.model_create_multi - @api.private def create(self, vals_list): return super( QueueJob, From d8571a4132abf4113455868883b7127f26c4892f Mon Sep 17 00:00:00 2001 From: bosd Date: Fri, 15 Aug 2025 16:07:21 +0200 Subject: [PATCH 2/2] [18.0][FIX] queue_job: Fix tests --- queue_job/models/queue_job.py | 12 ++++++++-- .../tests/test_queue_job_protected_write.py | 22 ++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py index d110c37c02..9502619c70 100644 --- a/queue_job/models/queue_job.py +++ b/queue_job/models/queue_job.py @@ -432,7 +432,11 @@ def _get_stuck_jobs_domain(self, queue_dl, started_dl): domain.append( [ "&", - ("date_enqueued", "<=", fields.Datetime.to_string(queue_dl)), + ( + "date_enqueued", + "<=", + fields.Datetime.to_string(queue_dl), + ), ("state", "=", "enqueued"), ] ) @@ -441,7 +445,11 @@ def _get_stuck_jobs_domain(self, queue_dl, started_dl): domain.append( [ "&", - ("date_started", "<=", fields.Datetime.to_string(started_dl)), + ( + "date_started", + "<=", + fields.Datetime.to_string(started_dl), + ), ("state", "=", "started"), ] ) diff --git a/queue_job/tests/test_queue_job_protected_write.py b/queue_job/tests/test_queue_job_protected_write.py index eadb16ab9c..f2b1c9bf48 100644 --- a/queue_job/tests/test_queue_job_protected_write.py +++ b/queue_job/tests/test_queue_job_protected_write.py @@ -8,19 +8,25 @@ class TestJobCreatePrivate(common.HttpCase): def test_create_error(self): - self.authenticate("admin", "admin") - with self.assertRaises(common.JsonRpcException) as cm, mute_logger("odoo.http"): + self.authenticate("demo", "demo") + with ( + self.assertRaises(common.JsonRpcException) as cm, + mute_logger("odoo.http"), + ): self.make_jsonrpc_request( "/web/dataset/call_kw", params={ "model": "queue.job", "method": "create", - "args": [], - "kwargs": { - "method_name": "write", - "model_name": "res.partner", - "uuid": "test", - }, + "args": [ + { + "method_name": "write", + "model_name": "res.partner", + "uuid": "test", + "state": "pending", + }, + ], + "kwargs": {}, }, headers={ "Cookie": f"session_id={self.session.sid};",