[FIX] FakeModelLoader: avoid loading module again on restore_registry() for version < 15

.travis.yml

@@ -80,8 +80,7 @@ install:
   - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
   - travis_install_nightly
   - pip install -e .
-  - mv tests/test_helper test_helper
-  - mv tests/test_helper_bis test_helper_bis
+  - mv tests/test_helper* .
 
 script:
   - travis_run_tests

odoo_test_helper/fake_model_loader.py

@@ -177,15 +177,16 @@ def restore_registry(self):
 
         self._clean_module_to_model()
 
-        # reload is need to reset correctly the field on the record
-        with mock.patch.object(self.env.cr, "commit"):
-            # Only before V15
-            if hasattr(self.env.registry, "model_cache"):
+        # reload is needed to reset correctly the field on the record
+        # but only up to Odoo 14
+        if version_info[0] < 15:
+
+            with mock.patch.object(self.env.cr, "commit"):
                 self.env.registry.model_cache.clear()
-            model_names = self.env.registry.load(
-                self.env.cr, FakePackage(self._module_name)
-            )
-            self.env.registry.setup_models(self.env.cr)
-            self.env.registry.init_models(
-                self.env.cr, model_names, {"module": self._module_name}
-            )
+                model_names = self.env.registry.load(
+                    self.env.cr, FakePackage(self._module_name)
+                )
+                self.env.registry.setup_models(self.env.cr)
+                self.env.registry.init_models(
+                    self.env.cr, model_names, {"module": self._module_name}
+                )

tests/test_helper_extended/__init__.py

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

tests/test_helper_extended/__manifest__.py

@@ -0,0 +1,19 @@
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+
+{
+    "name": "Test Helper Extended",
+    "summary": "Another fake module extending fake module Test Helper for testing",
+    "version": "0.0.0",
+    "category": "Uncategorized",
+    "website": "www.akretion.com",
+    "author": " Akretion",
+    "license": "LGPL-3",
+    "application": False,
+    "installable": True,
+    "external_dependencies": {"python": [], "bin": []},
+    "depends": ["test_helper"],
+    "data": [],
+    "demo": [],
+    "qweb": [],
+}

tests/test_helper_extended/models/__init__.py

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

tests/test_helper_extended/models/test_mixin.py

@@ -0,0 +1,10 @@
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo import fields, models
+
+
+class TestMixin(models.AbstractModel):
+    _inherit = "test.mixin"
+    _description = "Test Mixin Extension"
+
+    test_char_02 = fields.Char()

tests/test_helper_extended/tests/__init__.py

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

tests/test_helper_extended/tests/test_registry.py

@@ -0,0 +1,33 @@
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+
+from odoo.release import version_info
+
+if version_info[0] >= 15:
+    from odoo.tests import TransactionCase
+
+    from odoo_test_helper import FakeModelLoader
+
+    class TestMixin(TransactionCase):
+        def test_mixin_after_reloading_parent_module(self):
+            self.assertIn("test.mixin", self.env.registry)
+            self.assertIn("test_char", self.env["test.mixin"]._fields)
+            self.assertIn("test_char_02", self.env["test.mixin"]._fields)
+
+            loader = FakeModelLoader(self.env, "odoo.addons.test_helper")
+            loader.backup_registry()
+
+            # trigger reload of parent module: test_helper
+            loader.update_registry(())
+
+            self.assertIn("test.mixin", self.env.registry)
+            self.assertIn("test_char", self.env["test.mixin"]._fields)
+            # new field should not be there anymore
+            self.assertNotIn("test_char_02", self.env["test.mixin"]._fields)
+
+            # but now we restore registry
+            loader.restore_registry()
+
+            self.assertIn("test.mixin", self.env.registry)
+            self.assertIn("test_char", self.env["test.mixin"]._fields)
+            # new field should be there again
+            self.assertIn("test_char_02", self.env["test.mixin"]._fields)