test: return spans as dict

tests/conftest.py

@@ -17,7 +17,9 @@ def set_api_url(
     monkeypatch.setenv("MERGIFY_API_URL", "http://localhost:9999")
 
 
-PytesterWithSpanReturnT = tuple[_pytest.pytester.RunResult, list[trace.ReadableSpan]]
+PytesterWithSpanReturnT = tuple[
+    _pytest.pytester.RunResult, dict[str, trace.ReadableSpan]
+]
 
 
 class PytesterWithSpanT(typing.Protocol):
@@ -45,6 +47,9 @@ def _run(
         spans: list[trace.ReadableSpan] = (
             plugin.mergify_tracer.exporter.get_finished_spans()  # type: ignore[attr-defined]
         )
-        return result, spans
+        spans_as_dict = {s.name: s for s in spans}
+        # Make sure we don't lose spans in the process
+        assert len(spans_as_dict) == len(spans)
+        return result, spans_as_dict
 
     return _run

tests/test_resources.py

@@ -15,7 +15,7 @@ def test_span_resources_attributes_ci(
     result, spans = pytester_with_spans()
     assert all(
         span.resource.attributes["cicd.provider.name"] == utils.get_ci_provider()
-        for span in spans
+        for span in spans.values()
     )
 
 
@@ -28,7 +28,7 @@ def test_span_resources_attributes_pytest(
             r"\d\.",
             typing.cast(str, span.resource.attributes["test.framework.version"]),
         )
-        for span in spans
+        for span in spans.values()
     )
 
 
@@ -40,7 +40,7 @@ def test_span_github_actions(
     monkeypatch.setenv("GITHUB_ACTIONS", "true")
     monkeypatch.setenv("GITHUB_REPOSITORY", "Mergifyio/pytest-mergify")
     result, spans = pytester_with_spans()
-    assert (
-        spans[0].resource.attributes["vcs.repository.name"]
-        == "Mergifyio/pytest-mergify"
+    assert all(
+        span.resource.attributes["vcs.repository.name"] == "Mergifyio/pytest-mergify"
+        for span in spans.values()
     )

tests/test_spans.py

@@ -5,8 +5,10 @@ def test_span(
     pytester_with_spans: conftest.PytesterWithSpanT,
 ) -> None:
     result, spans = pytester_with_spans()
-    assert any(s.name == "test run" for s in spans)
-    assert any(s.name == "test_span.py::test_pass" for s in spans)
-    assert any(s.name == "test_span.py::test_pass::setup" for s in spans)
-    assert any(s.name == "test_span.py::test_pass::call" for s in spans)
-    assert any(s.name == "test_span.py::test_pass::teardown" for s in spans)
+    assert set(spans.keys()) == {
+        "test run",
+        "test_span.py::test_pass",
+        "test_span.py::test_pass::setup",
+        "test_span.py::test_pass::call",
+        "test_span.py::test_pass::teardown",
+    }