Submodule fix for ticket 67630

queue_job/controllers/main.py

@@ -8,11 +8,10 @@
 import traceback
 from io import StringIO
 
-from psycopg2 import OperationalError, errorcodes
-from werkzeug.exceptions import BadRequest, Forbidden
-
 from odoo import SUPERUSER_ID, _, api, http, registry, tools
 from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY
+from psycopg2 import OperationalError, errorcodes
+from werkzeug.exceptions import BadRequest, Forbidden
 
 from ..delay import chain, group
 from ..exception import FailedJobError, NothingToDoJob, RetryableJobError

queue_job/fields.py

@@ -6,7 +6,6 @@
 
 import dateutil
 import lxml
-
 from odoo import fields, models
 from odoo.tools.func import lazy
 

queue_job/jobrunner/__init__.py

@@ -3,8 +3,8 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
 import logging
-from threading import Thread
 import time
+from threading import Thread
 
 from odoo.service import server
 from odoo.tools import config

queue_job/jobrunner/channels.py

@@ -7,7 +7,8 @@
 from weakref import WeakValueDictionary
 
 from ..exception import ChannelNotFound
-from ..job import CANCELLED, DONE, ENQUEUED, FAILED, PENDING, STARTED, WAIT_DEPENDENCIES
+from ..job import (CANCELLED, DONE, ENQUEUED, FAILED, PENDING, STARTED,
+                   WAIT_DEPENDENCIES)
 
 NOT_DONE = (WAIT_DEPENDENCIES, PENDING, ENQUEUED, STARTED, FAILED)
 

queue_job/jobrunner/runner.py

@@ -147,12 +147,11 @@
 import time
 from contextlib import closing, contextmanager
 
+import odoo
 import psycopg2
 import requests
-from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
-
-import odoo
 from odoo.tools import config
+from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
 
 from . import queue_job_config
 from .channels import ENQUEUED, NOT_DONE, PENDING, ChannelManager

queue_job/models/queue_job.py

@@ -6,24 +6,15 @@
 from datetime import datetime, timedelta
 
 from odoo import _, api, exceptions, fields, models
+from odoo.addons.base_sparse_field.models.fields import Serialized
 from odoo.osv import expression
 from odoo.tools import config, html_escape
 
-from odoo.addons.base_sparse_field.models.fields import Serialized
-
 from ..delay import Graph
 from ..exception import JobError
 from ..fields import JobSerialized
-from ..job import (
-    CANCELLED,
-    DONE,
-    FAILED,
-    PENDING,
-    STARTED,
-    STATES,
-    WAIT_DEPENDENCIES,
-    Job,
-)
+from ..job import (CANCELLED, DONE, FAILED, PENDING, STARTED, STATES,
+                   WAIT_DEPENDENCIES, Job)
 
 _logger = logging.getLogger(__name__)
 

queue_job/tests/__init__.py

@@ -1,8 +0,0 @@
-from . import test_runner_channels
-from . import test_runner_runner
-from . import test_delayable
-from . import test_json_field
-from . import test_model_job_channel
-from . import test_model_job_function
-from . import test_queue_job_protected_write
-from . import test_wizards

queue_job/tests/common.py

@@ -8,13 +8,11 @@
 from operator import attrgetter
 from unittest import TestCase, mock
 
-from odoo.tests.case import TestCase as _TestCase
-from odoo.tests.common import MetaCase
-
 from odoo.addons.queue_job.delay import Graph
-
 # pylint: disable=odoo-addons-relative-import
 from odoo.addons.queue_job.job import Job
+from odoo.tests.case import TestCase as _TestCase
+from odoo.tests.common import MetaCase
 
 
 @contextmanager
@@ -212,7 +210,8 @@ def assert_enqueued_job(self, method, args=None, kwargs=None, properties=None):
 
         if expected_call not in actual_calls:
             raise AssertionError(
-                "Job {} was not enqueued.\n" "Actual enqueued jobs:\n{}".format(
+                "Job {} was not enqueued.\n"
+                "Actual enqueued jobs:\n{}".format(
                     self._format_job_call(expected_call),
                     "\n".join(
                         f" * {self._format_job_call(call)}" for call in actual_calls

queue_job/tests/test_json_field.py

@@ -5,12 +5,10 @@
 from datetime import date, datetime
 
 from lxml import etree
-
-from odoo.tests import common
-
 # pylint: disable=odoo-addons-relative-import
 # we are testing, we want to test as we were an external consumer of the API
 from odoo.addons.queue_job.fields import JobDecoder, JobEncoder
+from odoo.tests import common
 
 
 class TestJson(common.TransactionCase):

queue_job/tests/test_model_job_channel.py

@@ -1,10 +1,9 @@
 # copyright 2018 Camptocamp
 # license lgpl-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
-from psycopg2 import IntegrityError
-
 import odoo
 from odoo.tests import common
+from psycopg2 import IntegrityError
 
 
 class TestJobChannel(common.TransactionCase):

queue_job_cron/tests/__init__.py

@@ -1 +0,0 @@
-from . import test_queue_job_cron

queue_job_cron_jobrunner/models/queue_job.py

@@ -6,18 +6,13 @@
 import traceback
 from io import StringIO
 
-from psycopg2 import OperationalError
-
 from odoo import _, api, models, tools
-from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY
-
 from odoo.addons.queue_job.controllers.main import PG_RETRY
-from odoo.addons.queue_job.exception import (
-    FailedJobError,
-    NothingToDoJob,
-    RetryableJobError,
-)
+from odoo.addons.queue_job.exception import (FailedJobError, NothingToDoJob,
+                                             RetryableJobError)
 from odoo.addons.queue_job.job import Job
+from odoo.service.model import PG_CONCURRENCY_ERRORS_TO_RETRY
+from psycopg2 import OperationalError
 
 _logger = logging.getLogger(__name__)
 

queue_job_cron_jobrunner/tests/__init__.py

@@ -1 +0,0 @@
-from . import test_queue_job

queue_job_cron_jobrunner/tests/test_queue_job.py

@@ -5,7 +5,6 @@
 from datetime import timedelta
 
 from freezegun import freeze_time
-
 from odoo import fields
 from odoo.tests.common import TransactionCase
 from odoo.tools import mute_logger

queue_job_subscribe/tests/__init__.py

@@ -1,4 +1,3 @@
 # Copyright 2016 Cédric Pigeon
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from . import test_job_subscribe

queue_job_subscribe/tests/test_job_subscribe.py

@@ -2,7 +2,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 import odoo.tests.common as common
-
 from odoo.addons.queue_job.job import Job
 
 

test_queue_job/models/test_models.py

@@ -2,7 +2,6 @@
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
 from odoo import api, fields, models
-
 from odoo.addons.queue_job.delay import chain
 from odoo.addons.queue_job.exception import RetryableJobError
 from odoo.addons.queue_job.job import identity_exact

test_queue_job/tests/__init__.py

@@ -1,8 +0,0 @@
-from . import test_autovacuum
-from . import test_delayable
-from . import test_dependencies
-from . import test_job
-from . import test_job_auto_delay
-from . import test_job_channels
-from . import test_related_actions
-from . import test_delay_mocks

test_queue_job/tests/common.py

@@ -1,9 +1,8 @@
 # Copyright 2016-2019 Camptocamp SA
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
-from odoo.tests import common
-
 from odoo.addons.queue_job.job import Job
+from odoo.tests import common
 
 
 class JobCommonCase(common.TransactionCase):

test_queue_job/tests/test_delay_mocks.py

@@ -5,11 +5,10 @@
 from unittest import mock
 
 import odoo.tests.common as common
-from odoo.tools import mute_logger
-
 from odoo.addons.queue_job.delay import Delayable
 from odoo.addons.queue_job.job import identity_exact
 from odoo.addons.queue_job.tests.common import mock_with_delay, trap_jobs
+from odoo.tools import mute_logger
 
 
 class TestDelayMocks(common.TransactionCase):

test_queue_job/tests/test_delayable.py

@@ -3,14 +3,8 @@
 # license lgpl-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
 import odoo.tests.common as common
-
-from odoo.addons.queue_job.delay import (
-    Delayable,
-    DelayableChain,
-    DelayableGroup,
-    chain,
-    group,
-)
+from odoo.addons.queue_job.delay import (Delayable, DelayableChain,
+                                         DelayableGroup, chain, group)
 
 
 class TestDelayable(common.TransactionCase):

test_queue_job/tests/test_dependencies.py

@@ -2,7 +2,6 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
 import odoo.tests.common as common
-
 from odoo.addons.queue_job.delay import DelayableGraph, chain, group
 from odoo.addons.queue_job.job import PENDING, WAIT_DEPENDENCIES, Job
 

test_queue_job/tests/test_job.py

@@ -6,24 +6,13 @@
 from unittest import mock
 
 import odoo.tests.common as common
-
 from odoo.addons.queue_job import identity_exact
 from odoo.addons.queue_job.delay import DelayableGraph
-from odoo.addons.queue_job.exception import (
-    FailedJobError,
-    NoSuchJobError,
-    RetryableJobError,
-)
-from odoo.addons.queue_job.job import (
-    DONE,
-    ENQUEUED,
-    FAILED,
-    PENDING,
-    RETRY_INTERVAL,
-    STARTED,
-    WAIT_DEPENDENCIES,
-    Job,
-)
+from odoo.addons.queue_job.exception import (FailedJobError, NoSuchJobError,
+                                             RetryableJobError)
+from odoo.addons.queue_job.job import (DONE, ENQUEUED, FAILED, PENDING,
+                                       RETRY_INTERVAL, STARTED,
+                                       WAIT_DEPENDENCIES, Job)
 
 from .common import JobCommonCase
 

test_queue_job/tests/test_job_auto_delay.py

@@ -1,9 +1,8 @@
 # Copyright 2020 Camptocamp SA
 # License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
 
-from odoo.tests.common import tagged
-
 from odoo.addons.queue_job.job import Job
+from odoo.tests.common import tagged
 
 from .common import JobCommonCase
 

test_queue_job/tests/test_job_channels.py

@@ -3,7 +3,6 @@
 
 import odoo.tests.common as common
 from odoo import exceptions
-
 from odoo.addons.queue_job.job import Job
 
 

test_queue_job/tests/test_json_field.py

@@ -3,11 +3,10 @@
 
 import json
 
-from odoo.tests import common
-
 # pylint: disable=odoo-addons-relative-import
 # we are testing, we want to test as if we were an external consumer of the API
 from odoo.addons.queue_job.fields import JobEncoder
+from odoo.tests import common
 
 
 class TestJsonField(common.TransactionCase):