[FIX] support subTest context manager for Odoo version 16.0 and greater

Author: petrus-v

pytest_odoo.py

@@ -10,7 +10,7 @@
 import subprocess
 import threading
 from contextlib import contextmanager
-from unittest import mock, TestCase
+from unittest import mock, TestCase as UnitTestTestCase
 from pathlib import Path
 from typing import Optional
 
@@ -217,18 +217,19 @@ def disable_odoo_test_retry():
         pass
 
 def support_subtest():
-    """Odoo from version 16.0 overwrite TestCase.SubTest context manager
+    """Odoo from version 16.0 re-define its own TestCase.subTest context manager
 
-    This overwrite assume the usage of OdooTestResult which we are not
-    using with pytest-odoo. So this restaure unitest SubTest Context manager
+    Odoo assume the usage of OdooTestResult which is not our case
+    using with pytest-odoo. So this fallback to the unitest.TestCase.subTest
+    Context manager
     """
     try:
-        from odoo.tests import  BaseCase
-        BaseCase.subTest = TestCase.subTest
+        from odoo.tests.case import TestCase
+        TestCase.subTest = UnitTestTestCase.subTest
 
         from odoo.tests.case import _Outcome
         _Outcome.result_supports_subtests = False
-    except (ImportError, AttributeError):
+    except ImportError:
         # Odoo <= 15.0
         pass
 

tests/mock/odoo/odoo/tests/__init__.py

@@ -1,8 +1,8 @@
 from unittest.mock import MagicMock
 common = MagicMock()
+from . import case
 
-
-class BaseCase:
+class BaseCase(case.TestCase):
 
     def run(*args, **kwargs):
         super().run(*args, **kwargs)

tests/mock/odoo/odoo/tests/case.py

@@ -0,0 +1,12 @@
+import contextlib
+
+
+class TestCase:
+    
+    @contextlib.contextmanager
+    def subTest(self, **kwargs):
+        """Simulate odoo TestCase.subTest from version 15.0"""
+
+
+class _Outcome:
+    pass

tests/test_pytest_odoo.py

@@ -6,8 +6,9 @@
 from _pytest import pathlib as pytest_pathlib
 from pytest_odoo import (
     _find_manifest_path,
-    monkey_patch_resolve_pkg_root_and_module_name,
     disable_odoo_test_retry,
+    monkey_patch_resolve_pkg_root_and_module_name,
+    support_subtest,
 )
 
 
@@ -93,7 +94,7 @@ def test_disable_odoo_test_retry(self):
 
         def restore_basecase_run():
             BaseCase.run = original_basecase_run
-        
+
         self.addCleanup(restore_basecase_run)
 
         disable_odoo_test_retry()
@@ -107,26 +108,67 @@ def test_disable_odoo_test_retry_ignore_run_doesnt_exists(self):
 
         def restore_basecase_run():
             BaseCase.run = original_basecase_run
-        
+
         self.addCleanup(restore_basecase_run)
-        
+
         del BaseCase.run
-        
+
         disable_odoo_test_retry()
         self.assertFalse(hasattr(BaseCase, "run"))
 
 
 
     def test_import_error(self):
-        from odoo import tests 
-        
+        from odoo import tests
+
         original_BaseCase = tests.BaseCase
 
         def restore_basecase():
             tests.BaseCase = original_BaseCase
-        
+
         self.addCleanup(restore_basecase)
-        
+
         del tests.BaseCase
         disable_odoo_test_retry()
-        
+
+    def test_support_subtest(self):
+        from odoo.tests import case
+
+        original_test_case = case.TestCase
+        original_outcome = case._Outcome
+
+        def restore():
+            case.TestCase = original_test_case
+            case._Outcome = original_outcome
+
+        self.addCleanup(restore)
+        support_subtest()
+        from odoo.tests import BaseCase
+
+        self.assertTrue(BaseCase.subTest is TestCase.subTest)
+
+    def test_support_subtest_no_base_case(self):
+        from odoo import tests
+
+        original_BaseCase = tests.BaseCase
+
+        def restore_basecase():
+            tests.BaseCase = original_BaseCase
+
+        self.addCleanup(restore_basecase)
+
+        del tests.BaseCase
+        support_subtest()
+
+    def test_support_subtest_import_error(self):
+        from odoo.tests import case
+
+        original_odoo_test_case = case.TestCase
+
+        def restore_testcase():
+            case.TestCase = original_odoo_test_case
+
+        self.addCleanup(restore_testcase)
+
+        del case.TestCase
+        support_subtest()