unpatch

Author: vitor-de-araujo

ddtrace/testing/internal/pytest/plugin.py

@@ -39,6 +39,7 @@
 from ddtrace.testing.internal.tracer_api.coverage import get_coverage_percentage
 from ddtrace.testing.internal.tracer_api.coverage import install_coverage
 from ddtrace.testing.internal.tracer_api.coverage import install_coverage_percentage
+from ddtrace.testing.internal.tracer_api.coverage import uninstall_coverage_percentage
 import ddtrace.testing.internal.tracer_api.pytest_hooks
 from ddtrace.testing.internal.utils import TestContext
 from ddtrace.testing.internal.utils import asbool
@@ -170,6 +171,7 @@ def pytest_sessionfinish(self, session: pytest.Session) -> None:
         coverage_percentage = get_coverage_percentage(_is_pytest_cov_enabled(session.config))
         if coverage_percentage is not None:
             self.session.metrics[TestTag.CODE_COVERAGE_LINES_PCT] = coverage_percentage
+            uninstall_coverage_percentage()
 
         self.session.finish()
 

ddtrace/testing/internal/tracer_api/coverage.py

@@ -13,6 +13,7 @@
 from ddtrace.contrib.internal.coverage.constants import PCT_COVERED_KEY
 from ddtrace.contrib.internal.coverage.data import _coverage_data
 from ddtrace.contrib.internal.coverage.patch import patch as patch_coverage
+from ddtrace.contrib.internal.coverage.patch import unpatch as unpatch_coverage
 from ddtrace.contrib.internal.coverage.patch import run_coverage_report
 from ddtrace.contrib.internal.coverage.utils import _is_coverage_invoked_by_coverage_run
 from ddtrace.contrib.internal.coverage.utils import _is_coverage_patched
@@ -62,6 +63,13 @@ def install_coverage_percentage():
     patch_coverage()
 
 
+def uninstall_coverage_percentage():
+    """
+    Undo patching of coverage.py.
+    """
+    unpatch_coverage()
+
+
 def get_coverage_percentage(pytest_cov_status: bool) -> t.Optional[float]:
     """
     Retrieve coverage percentage collected during a pytest-cov test session, if available.

tests/testing/internal/pytest/test_plugin.py

@@ -6,6 +6,7 @@
 
 import os
 import typing as t
+from unittest.mock import MagicMock
 from unittest.mock import Mock
 from unittest.mock import patch
 
@@ -638,7 +639,7 @@ def test_pytest_sessionfinish_normal_completion(self) -> None:
         plugin = TestOptPlugin(session_manager=mock_manager)
 
         # Set up session and manager
-        plugin.session = Mock()
+        plugin.session = MagicMock()
         plugin.manager = Mock()
         plugin.is_xdist_worker = False
 
@@ -661,7 +662,7 @@ def test_pytest_sessionfinish_test_failure(self) -> None:
         plugin = TestOptPlugin(session_manager=mock_manager)
 
         # Set up session and manager
-        plugin.session = Mock()
+        plugin.session = MagicMock()
         plugin.manager = Mock()
         plugin.is_xdist_worker = False
 
@@ -681,7 +682,7 @@ def test_pytest_sessionfinish_xdist_worker(self) -> None:
         plugin = TestOptPlugin(session_manager=mock_manager)
 
         # Set up session and manager
-        plugin.session = Mock()
+        plugin.session = MagicMock()
         plugin.manager = Mock()
         plugin.is_xdist_worker = True  # Worker mode