[15.0] connector-interfaces: fix test cases mock import

OCA · May 6, 2024 · fad47ff · fad47ff
1 parent e452bd1
commit fad47ff
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 20 deletions.
diff --git a/connector_importer/models/import_type.py b/connector_importer/models/import_type.py
@@ -107,7 +107,10 @@ def _check_options(self):
             )
 
     def _load_options(self):
-        return yaml.safe_load(self.options or "") or []
+        options = []
+        if self.options:
+            options = yaml.safe_load(self.options)
+        return options if isinstance(options, list) else [options]
 
     def available_importers(self):
         self.ensure_one()

diff --git a/connector_importer/tests/common.py b/connector_importer/tests/common.py
@@ -80,7 +80,11 @@ def _setup_records(cls):
                 "key": "fake",
                 "options": """
 - model: res.partner
-  importer: fake.partner.importer
+  importer:
+    name: fake.partner.importer
+  options:
+    record_handler:
+        match_domain: "[('name', '=', values['name'])]"
                 """,
             }
         )

diff --git a/connector_importer/tests/test_event_listeners.py b/connector_importer/tests/test_event_listeners.py
@@ -2,7 +2,8 @@
 # Copyright 2023 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import mock
+from unittest import mock
+
 from odoo_test_helper import FakeModelLoader
 
 from odoo.tools import mute_logger
@@ -56,7 +57,11 @@ def setUpClass(cls):
             {
                 "options": f"""
 - model: res.partner
-  importer: fake.partner.importer
+  importer:
+   name: fake.partner.importer
+  options:
+    record_handler:
+        match_domain: "[('name', '=', values['name'])]"
 - model: {FakeImportedModel._name}
   options:
     record_handler:

diff --git a/connector_importer/tests/test_import_type.py b/connector_importer/tests/test_import_type.py
@@ -42,8 +42,8 @@ def test_available_importers_legacy(self):
             importers,
             (
                 {
-                    "importer": "partner.importer",
                     "model": "res.partner",
+                    "importer": "partner.importer",
                     "is_last_importer": False,
                     "context": {},
                     "options": {
@@ -54,8 +54,8 @@ def test_available_importers_legacy(self):
                     },
                 },
                 {
-                    "importer": "user.importer",
                     "model": "res.users",
+                    "importer": "user.importer",
                     "is_last_importer": False,
                     "context": {},
                     "options": {
@@ -66,8 +66,8 @@ def test_available_importers_legacy(self):
                     },
                 },
                 {
-                    "importer": "import.withspaces",
                     "model": "another.one",
+                    "importer": "import.withspaces",
                     "is_last_importer": True,
                     "context": {},
                     "options": {

diff --git a/connector_importer/tests/test_recordset_importer.py b/connector_importer/tests/test_recordset_importer.py
@@ -2,7 +2,7 @@
 # Copyright 2018 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-import mock
+from unittest import mock
 
 from odoo.tools import mute_logger
 

diff --git a/connector_importer/tests/test_source.py b/connector_importer/tests/test_source.py
@@ -3,7 +3,8 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 
-import mock
+from unittest import mock
+
 from odoo_test_helper import FakeModelLoader
 
 from .common import BaseTestCase

diff --git a/connector_importer/utils/misc.py b/connector_importer/utils/misc.py
@@ -66,7 +66,7 @@ def to_b64(file_content):
     """Safe convertion to b64"""
     try:
         # py > 3.9
-        return base64.encodestring(file_content)
+        return base64.encodebytes(file_content)
     except AttributeError:
         # py <= 3.9
         return base64.b64encode(file_content)
diff --git a/connector_importer_source_sftp/tests/common.py b/connector_importer_source_sftp/tests/common.py
@@ -2,10 +2,7 @@
 # @author: Simone Orsi <simahawk@gmail.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
-from odoo.addons.component.tests.common import (
-    TransactionComponentCase,
-    TransactionComponentRegistryCase,
-)
+from odoo.addons.component.tests.common import TransactionComponentCase
 from odoo.addons.connector_importer.tests.common import TestImporterMixin
 
 
@@ -28,7 +25,7 @@ def setUpClass(cls):
 
 
 class SFTPSourceTransactionComponentRegistryCase(
-    TransactionComponentRegistryCase, TestImporterMixin, TestSourceCSVSFTPMixin
+    TestImporterMixin, TestSourceCSVSFTPMixin
 ):
     @classmethod
     def setUpClass(cls):

diff --git a/connector_importer_source_sftp/tests/test_csv_sftp_source.py b/connector_importer_source_sftp/tests/test_csv_sftp_source.py
@@ -4,8 +4,7 @@
 
 import base64
 import io
-
-import mock
+from unittest import mock
 
 from odoo.tools import mute_logger
 
@@ -15,7 +14,6 @@
 
 
 class TestSourceCSV(SFTPSourceTransactionComponentCase):
-
     extra_fields = [
         "chunk_size",
         "csv_filesize",

diff --git a/connector_importer_source_sftp/tests/test_event_listener.py b/connector_importer_source_sftp/tests/test_event_listener.py
@@ -4,8 +4,7 @@
 
 import base64
 import io
-
-import mock
+from unittest import mock
 
 from odoo.tools import mute_logger