fix(ci-visibility): fix suite status when xdist is used

ddtrace/contrib/internal/pytest/_plugin_v2.py

@@ -679,7 +679,10 @@ def _pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
     InternalTestSession.finish(force_finish_children=True)
 
 
+@pytest.hookimpl(hookwrapper=True, tryfirst=True)
 def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
+    yield
+
     if not is_test_visibility_enabled():
         return
 

ddtrace/internal/ci_visibility/api/_base.py

@@ -90,6 +90,7 @@ def __post_init__(self):
 
 class SPECIAL_STATUS(Enum):
     UNFINISHED = 1
+    NONSTARTED = 2
 
 
 CIDT = TypeVar("CIDT", TestModuleId, TestSuiteId, TestId)  # Child item ID types
@@ -415,6 +416,8 @@ def get_span_id(self) -> Optional[int]:
     def get_status(self) -> Union[TestStatus, SPECIAL_STATUS]:
         if self.is_finished():
             return self._status
+        if not self.is_started():
+            return SPECIAL_STATUS.NONSTARTED
         return SPECIAL_STATUS.UNFINISHED
 
     def get_raw_status(self) -> TestStatus:
@@ -562,7 +565,10 @@ def get_status(self) -> Union[TestStatus, SPECIAL_STATUS]:
 
         for child in self._children.values():
             child_status = child.get_status()
-            if child_status == SPECIAL_STATUS.UNFINISHED:
+            if child_status == SPECIAL_STATUS.NONSTARTED:
+                # This means that the child was never started, so we don't count it
+                continue
+            elif child_status == SPECIAL_STATUS.UNFINISHED:
                 # There's no point in continuing to count if we care about unfinished children
                 log.debug("Item %s has unfinished children", self)
                 return SPECIAL_STATUS.UNFINISHED

tests/contrib/pytest/test_pytest_xdist_snapshot.py

@@ -0,0 +1,179 @@
+import os
+import subprocess
+from unittest import mock
+
+import pytest
+
+from ddtrace.contrib.internal.pytest._utils import _USE_PLUGIN_V2
+from ddtrace.internal.ci_visibility._api_client import TestVisibilityAPISettings
+from tests.ci_visibility.util import _get_default_ci_env_vars
+from tests.utils import TracerTestCase
+from tests.utils import snapshot
+
+######
+# Skip these tests if they are not running under riot
+riot_env_value = os.getenv("RIOT", None)
+if not riot_env_value:
+    pytest.importorskip("xdist", reason="Pytest xdist tests, not running under riot")
+######
+
+
+
+pytestmark = pytest.mark.skipif(not _USE_PLUGIN_V2, reason="Tests in this module are for v2 of the pytest plugin")
+
+SNAPSHOT_IGNORES = [
+    "meta.ci.workspace_path",
+    "meta.error.stack",
+    "meta.library_version",
+    "meta.os.architecture",
+    "meta.os.platform",
+    "meta.os.version",
+    "meta.runtime-id",
+    "meta.runtime.version",
+    "meta.test.framework_version",
+    "meta.test_module_id",
+    "meta.test_session_id",
+    "meta.test_suite_id",
+    "metrics._dd.top_level",
+    "metrics._dd.tracer_kr",
+    "metrics._sampling_priority_v1",
+    "metrics.process_id",
+    "duration",
+    "start",
+]
+SNAPSHOT_IGNORES_PATCH_ALL = SNAPSHOT_IGNORES + ["meta.http.useragent"]
+
+SNAPSHOT_IGNORES_ITR_COVERAGE = ["metrics.test.source.start", "metrics.test.source.end", "meta.test.source.file"]
+
+
+class PytestXdistSnapshotTestCase(TracerTestCase):
+    @pytest.fixture(autouse=True)
+    def fixtures(self, testdir, monkeypatch, git_repo):
+        self.testdir = testdir
+        self.monkeypatch = monkeypatch
+        self.git_repo = git_repo
+
+    @snapshot(ignores=SNAPSHOT_IGNORES)
+    def test_pytest_xdist_will_include_lines_pct(self):
+        tools = """
+                def add_two_number_list(list_1, list_2):
+                    output_list = []
+                    for number_a, number_b in zip(list_1, list_2):
+                        output_list.append(number_a + number_b)
+                    return output_list
+
+                def multiply_two_number_list(list_1, list_2):
+                    output_list = []
+                    for number_a, number_b in zip(list_1, list_2):
+                        output_list.append(number_a * number_b)
+                    return output_list
+                """
+        self.testdir.makepyfile(tools=tools)
+        test_tools = """
+                from tools import add_two_number_list
+
+                def test_add_two_number_list():
+                    a_list = [1,2,3,4,5,6,7,8]
+                    b_list = [2,3,4,5,6,7,8,9]
+                    actual_output = add_two_number_list(a_list, b_list)
+
+                    assert actual_output == [3,5,7,9,11,13,15,17]
+                """
+        self.testdir.makepyfile(test_tools=test_tools)
+        self.testdir.chdir()
+        with mock.patch(
+            "ddtrace.internal.ci_visibility._api_client._TestVisibilityAPIClientBase.fetch_settings",
+            return_value=TestVisibilityAPISettings(False, False, False, False),
+        ):
+            subprocess.run(
+                ["ddtrace-run", "coverage", "run", "--include=tools.py", "-m", "pytest", "--ddtrace", "-n", "2"],
+                env=_get_default_ci_env_vars(
+                    dict(
+                        DD_API_KEY="foobar.baz",
+                        DD_CIVISIBILITY_ITR_ENABLED="false",
+                        DD_PATCH_MODULES="sqlite3:false",
+                        CI_PROJECT_DIR=str(self.testdir.tmpdir),
+                        DD_CIVISIBILITY_AGENTLESS_ENABLED="false",
+                    )
+                ),
+            )
+
+    @snapshot(ignores=SNAPSHOT_IGNORES)
+    def test_pytest_xdist_wont_include_lines_pct_if_report_empty(self):
+        tools = """
+                def add_two_number_list(list_1, list_2):
+                    output_list = []
+                    for number_a, number_b in zip(list_1, list_2):
+                        output_list.append(number_a + number_b)
+                    return output_list
+
+                def multiply_two_number_list(list_1, list_2):
+                    output_list = []
+                    for number_a, number_b in zip(list_1, list_2):
+                        output_list.append(number_a * number_b)
+                    return output_list
+                """
+        self.testdir.makepyfile(tools=tools)
+        test_tools = """
+                from tools import add_two_number_list
+
+                def test_add_two_number_list():
+                    a_list = [1,2,3,4,5,6,7,8]
+                    b_list = [2,3,4,5,6,7,8,9]
+                    actual_output = add_two_number_list(a_list, b_list)
+
+                    assert actual_output == [3,5,7,9,11,13,15,17]
+                """
+        self.testdir.makepyfile(test_tools=test_tools)
+        self.testdir.chdir()
+        with mock.patch(
+            "ddtrace.internal.ci_visibility._api_client._TestVisibilityAPIClientBase.fetch_settings",
+            return_value=TestVisibilityAPISettings(False, False, False, False),
+        ):
+            subprocess.run(
+                ["ddtrace-run", "coverage", "run", "--include=nothing.py", "-m", "pytest", "--ddtrace", "-n", "2"],
+                env=_get_default_ci_env_vars(
+                    dict(
+                        DD_API_KEY="foobar.baz",
+                        DD_CIVISIBILITY_ITR_ENABLED="false",
+                        DD_PATCH_MODULES="sqlite3:false",
+                        CI_PROJECT_DIR=str(self.testdir.tmpdir),
+                        DD_CIVISIBILITY_AGENTLESS_ENABLED="false",
+                    )
+                ),
+            )
+
+    @snapshot(ignores=SNAPSHOT_IGNORES_PATCH_ALL)
+    def test_pytest_xdist_with_ddtrace_patch_all(self):
+        call_httpx = """
+                import httpx
+
+                def call_httpx():
+                    return httpx.get("http://localhost:9126/bad_path.cgi")
+                """
+        self.testdir.makepyfile(call_httpx=call_httpx)
+        test_call_httpx = """
+                from call_httpx import call_httpx
+
+                def test_call_urllib():
+                    r = call_httpx()
+                    assert r.status_code == 404
+                """
+        self.testdir.makepyfile(test_call_httpx=test_call_httpx)
+        self.testdir.chdir()
+        with mock.patch(
+            "ddtrace.internal.ci_visibility._api_client._TestVisibilityAPIClientBase.fetch_settings",
+            return_value=TestVisibilityAPISettings(False, False, False, False),
+        ):
+            subprocess.run(
+                ["pytest", "--ddtrace", "--ddtrace-patch-all", "-n", "2"],
+                env=_get_default_ci_env_vars(
+                    dict(
+                        DD_API_KEY="foobar.baz",
+                        DD_CIVISIBILITY_ITR_ENABLED="false",
+                        CI_PROJECT_DIR=str(self.testdir.tmpdir),
+                        DD_CIVISIBILITY_AGENTLESS_ENABLED="false",
+                        DD_PATCH_MODULES="httpx:true",
+                    )
+                ),
+            )