Merge PR #257 into 18.0

Signed-off-by yvaucher

Author: OCA-git-bot

server_environment/models/server_env_mixin.py

@@ -7,6 +7,7 @@
 from lxml import etree
 
 from odoo import api, fields, models
+from odoo.tools import mute_logger
 
 from odoo.addons.base_sparse_field.models.fields import Serialized
 
@@ -356,7 +357,9 @@ def _server_env_transform_field_to_read_from_env(self, field):
         inverse_method = _partialmethod(
             type(self)._inverse_server_env, field.name, __name__=inverse_method_name
         )
-        setattr(type(self), inverse_method_name, inverse_method)
+        # Mute message related to new safeguard (PR odoo/odoo#247151)
+        with mute_logger("odoo.tests.common"):
+            setattr(type(self), inverse_method_name, inverse_method)
         field.inverse = inverse_method_name
         field.store = False
         field.required = False

server_environment/server_env.py

@@ -10,6 +10,7 @@
 from lxml import etree
 
 from odoo import api, fields, models
+from odoo.tools import mute_logger
 from odoo.tools.config import config as system_base_config
 
 from odoo.addons.base_sparse_field.models.fields import Serialized
@@ -212,11 +213,9 @@ def _add_columns(cls):
                 sparse="config",
                 readonly=True,
             )
-            setattr(
-                ServerConfiguration,
-                col_name,
-                tmp_field,
-            )
+            # Mute message related to new safeguard (PR odoo/odoo#247151)
+            with mute_logger("odoo.tests.common"):
+                setattr(ServerConfiguration, col_name, tmp_field)
             tmp_field.name = col_name
             ServerConfiguration._field_definitions.append(tmp_field)
             cls._conf_defaults[col_name] = value

server_environment/tests/common.py

@@ -48,6 +48,7 @@ def load_config(
         serv_config_class=server_env_mixin,
     ):
         original_serv_config = serv_config_class.serv_config
+        original_fields = dir(server_env.ServerConfiguration)
         try:
             with (
                 self.set_config_dir(config_dir),
@@ -61,3 +62,7 @@ def load_config(
         finally:
             serv_config_class.serv_config = original_serv_config
             server_env.serv_config = original_serv_config
+            for attr, fld in vars(server_env.ServerConfiguration).items():
+                if attr not in original_fields:
+                    server_env.ServerConfiguration._field_definitions.remove(fld)
+                    delattr(self.env["server.config"].__class__, attr)

server_environment/tests/test_server_environment.py

@@ -82,9 +82,9 @@ def test_default_hidden_password(self):
             model = self.env["server.config"]
             model._add_columns()
             self.env.registry.setup_models(self.env.cr)
-        defaults = self._test_default(hidden_pwd=True)
+            defaults = self._test_default(hidden_pwd=True)
 
-        self.assertIn("odoo_I_admin_passwd", defaults)
-        self.assertIn("odoo_I_db_password", defaults)
-        self.assertIn("odoo_I_smtp_password", defaults)
-        self.assertIn("outgoing_mail_provider_promail_I_smtp_pass", defaults)
+            self.assertIn("odoo_I_admin_passwd", defaults)
+            self.assertIn("odoo_I_db_password", defaults)
+            self.assertIn("odoo_I_smtp_password", defaults)
+            self.assertIn("outgoing_mail_provider_promail_I_smtp_pass", defaults)

server_environment_data_encryption/tests/test_server_environment_data_encrypt.py

@@ -14,18 +14,27 @@ def setUpClass(cls):
         super().setUpClass()
         cls.loader = FakeModelLoader(cls.env, cls.__module__)
         cls.loader.backup_registry()
+        cls._origin_fields = {}
+        for model in "res.partner", "res.users":
+            cls._origin_fields[model] = set(dir(cls.env[model].__class__))
 
+    def setUp(self):
+        super().setUp()
         # The fake class is imported here !! After the backup_registry
         from .models import FakePartner
 
-        cls.loader.update_registry((FakePartner,))
-        cls.set_new_key_env("prod")
-        cls.set_new_key_env("preprod")
+        self.loader.update_registry((FakePartner,))
+        self.addCleanup(self.loader.restore_registry)
+        self.addCleanup(self.remove_mixin_fields)
+        self.set_new_key_env("prod")
+        self.set_new_key_env("preprod")
 
-    @classmethod
-    def tearDownClass(cls):
-        cls.loader.restore_registry()
-        super().tearDownClass()
+    def remove_mixin_fields(self):
+        # E.g: server_env_defaults, _inverse_server_env_city
+        for model in "res.partner", "res.users":
+            extra = set(self.env[model].__class__.__dict__) - self._origin_fields[model]
+            for attr in extra:
+                delattr(self.env[model].__class__, attr)
 
     def test_env_dependent_value(self):
         partner = self.env["res.partner"].create(