Merge PR #201 into 13.0

Signed-off-by guewen
OCA · Nov 29, 2019 · a1c9ca2 · a1c9ca2
2 parents 0b71a39 + f058f6e
commit a1c9ca2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/queue_job/models/queue_job.py b/queue_job/models/queue_job.py
@@ -215,7 +215,7 @@ def autovacuum(self):
         for channel in self.env["queue.job.channel"].search([]):
             deadline = datetime.now() - timedelta(days=int(channel.removal_interval))
             jobs = self.search(
-                [("date_done", "<=", deadline), ("channel", "=", channel.name)]
+                [("date_done", "<=", deadline), ("channel", "=", channel.complete_name)]
             )
             if jobs:
                 jobs.unlink()

diff --git a/test_queue_job/tests/test_autovacuum.py b/test_queue_job/tests/test_autovacuum.py
@@ -43,7 +43,9 @@ def test_autovacuum_multi_channel(self):
         job_root = self._create_job()
         job_root.write({"date_done": date_done})
         job_60days = self._create_job()
-        job_60days.write({"channel": channel_60days.name, "date_done": date_done})
+        job_60days.write(
+            {"channel": channel_60days.complete_name, "date_done": date_done}
+        )
 
         self.assertEqual(len(self.env["queue.job"].search([])), 2)
         self.env["queue.job"].autovacuum()