feat: include skipped tests (#100)

Author: jd

pytest_mergify/__init__.py

@@ -107,11 +107,30 @@ def pytest_runtest_protocol(
         self, item: _pytest.nodes.Item
     ) -> typing.Generator[None, None, None]:
         if self.tracer:
+            if item.get_closest_marker("skip") is not None:
+                skip = True
+            elif (skipif_marker := item.get_closest_marker("skipif")) is not None:
+                condition = skipif_marker.args[0]
+                if isinstance(condition, str):
+                    # Evaluate the condition in the test module's global namespace.
+                    # nosemgrep: python.lang.security.audit.eval-detected.eval-detected
+                    skip = eval(condition, item.module.__dict__)  # type: ignore[attr-defined]
+                else:
+                    skip = bool(condition)
+            else:
+                skip = False
+
+            if skip:
+                skip_attributes = {"test.case.result.status": "skipped"}
+            else:
+                skip_attributes = {}
+
             context = opentelemetry.trace.set_span_in_context(self.session_span)
             with self.tracer.start_as_current_span(
                 item.name,
                 attributes={
                     **self._attributes_from_item(item),
+                    **skip_attributes,
                     **{"test.scope": "case"},
                 },
                 context=context,

tests/test_spans.py

@@ -1,6 +1,7 @@
 import opentelemetry.trace
 from opentelemetry.semconv.trace import SpanAttributes
 
+import pytest
 
 from tests import conftest
 
@@ -107,6 +108,69 @@ def test_skipped():
     assert spans["test_skipped"].parent.span_id == session_span.context.span_id
 
 
+@pytest.mark.parametrize(
+    "mark",
+    [
+        "skip",
+        "skipif(True, reason='not needed')",
+        "skipif(1 + 1, reason='with eval')",
+        "skipif('1 + 1', reason='as str')",
+    ],
+)
+def test_mark_skipped(
+    mark: str,
+    pytester_with_spans: conftest.PytesterWithSpanT,
+) -> None:
+    result, spans = pytester_with_spans(f"""
+import pytest
+@pytest.mark.{mark}
+def test_skipped():
+    assert False
+""")
+    session_span = spans["pytest session start"]
+
+    assert spans["test_skipped"].attributes == {
+        "test.case.result.status": "skipped",
+        "test.scope": "case",
+        "code.function": "test_skipped",
+        "code.lineno": 1,
+        "code.filepath": "test_mark_skipped.py",
+    }
+    assert (
+        spans["test_skipped"].status.status_code == opentelemetry.trace.StatusCode.UNSET
+    )
+    assert session_span.context is not None
+    assert spans["test_skipped"].parent is not None
+    assert spans["test_skipped"].parent.span_id == session_span.context.span_id
+
+
+def test_mark_not_skipped(
+    pytester_with_spans: conftest.PytesterWithSpanT,
+) -> None:
+    result, spans = pytester_with_spans("""
+import pytest
+@pytest.mark.skipif(False, reason='not skipped')
+def test_not_skipped():
+    assert True
+""")
+    session_span = spans["pytest session start"]
+
+    assert spans["test_not_skipped"].attributes == {
+        "test.case.result.status": "passed",
+        "test.scope": "case",
+        "code.function": "test_not_skipped",
+        "code.lineno": 1,
+        "code.filepath": "test_mark_not_skipped.py",
+    }
+    assert (
+        spans["test_not_skipped"].status.status_code
+        == opentelemetry.trace.StatusCode.OK
+    )
+    assert session_span.context is not None
+    assert spans["test_not_skipped"].parent is not None
+    assert spans["test_not_skipped"].parent.span_id == session_span.context.span_id
+
+
 def test_span_resources_test_run_id(
     pytester_with_spans: conftest.PytesterWithSpanT,
 ) -> None: