Improve coverage

Author: nicoddemus

src/_pytest/subtests.py

@@ -129,10 +129,9 @@ def _new(
 def subtests(request: SubRequest) -> Subtests:
     """Provides subtests functionality."""
     capmam = request.node.config.pluginmanager.get_plugin("capturemanager")
-    if capmam is not None:
-        suspend_capture_ctx = capmam.global_and_fixture_disabled
-    else:
-        suspend_capture_ctx = nullcontext
+    suspend_capture_ctx = (
+        capmam.global_and_fixture_disabled if capmam is not None else nullcontext
+    )
     return Subtests(request.node.ihook, suspend_capture_ctx, request, _ispytest=True)
 
 
@@ -377,11 +376,9 @@ def pytest_report_teststatus(
                 category = "xfailed"
                 short = "y"  # x letter is used for regular xfail, y for subtest xfail
                 status = "SUBXFAIL"
-            elif outcome == "passed":
-                category = "xpassed"
-                short = "Y"  # X letter is used for regular xpass, Y for subtest xpass
-                status = "SUBXPASS"
-            else:
+            # outcome == "passed" in an xfail is only possible via a @pytest.mark.xfail mark, which
+            # is not applicable to a subtest, which only handles pytest.xfail().
+            else:  # pragma: no cover
                 # This should not normally happen, unless some plugin is setting wasxfail without
                 # the correct outcome. Pytest expects the call outcome to be either skipped or
                 # passed in case of xfail.

testing/test_subtests.py

@@ -3,6 +3,8 @@
 import sys
 from typing import Literal
 
+from _pytest.subtests import SubtestContext
+from _pytest.subtests import SubtestReport
 import pytest
 
 
@@ -642,9 +644,10 @@ def test(subtests):
         """
         )
 
-    def test_capturing(self, pytester: pytest.Pytester) -> None:
+    @pytest.mark.parametrize("mode", ["fd", "sys"])
+    def test_capturing(self, pytester: pytest.Pytester, mode: str) -> None:
         self.create_file(pytester)
-        result = pytester.runpytest()
+        result = pytester.runpytest(f"--capture={mode}")
         result.stdout.fnmatch_lines(
             [
                 "*__ test (i='A') __*",
@@ -952,3 +955,23 @@ def test(subtests):
             "* 3 failed in *",
         ]
     )
+
+
+def test_serialization() -> None:
+    from _pytest.subtests import pytest_report_from_serializable
+    from _pytest.subtests import pytest_report_to_serializable
+
+    report = SubtestReport(
+        "test_foo::test_foo",
+        ("test_foo.py", 12, ""),
+        keywords={},
+        outcome="passed",
+        when="call",
+        longrepr=None,
+        context=SubtestContext(msg="custom message", kwargs=dict(i=10)),
+    )
+    data = pytest_report_to_serializable(report)
+    assert data is not None
+    new_report = pytest_report_from_serializable(data)
+    assert new_report is not None
+    assert new_report.context == SubtestContext(msg="custom message", kwargs=dict(i=10))