Improve reporting in case of xfail (#194)

The test status report of subtests that xfail now retains the subtest
description and fixes the summary line to take xfail and xpass into account.

Author: michelhe

CHANGELOG.rst

@@ -7,8 +7,10 @@ UNRELEASED
 *UNRELEASED*
 
 * Print output "dots" for successful unittest subtests (`#164`_).
+* Improved reporting in case subtests raise `pytest.xfail` (`#194`_).
 
 .. _#164: https://github.com/pytest-dev/pytest-subtests/issues/164
+.. _#194: https://github.com/pytest-dev/pytest-subtests/pull/194
 
 0.14.1
 ------

src/pytest_subtests/plugin.py

@@ -457,12 +457,26 @@ def pytest_report_teststatus(
     if report.when != "call" or not isinstance(report, SubTestReport):
         return None
 
-    if hasattr(report, "wasxfail"):
-        return None
-
     outcome = report.outcome
     description = report.sub_test_description()
-    if report.passed:
+
+    if hasattr(report, "wasxfail"):
+        if outcome == "skipped":
+            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:
+            # 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.
+            # Let's pass this report to the next hook.
+            return None
+        short = "" if config.option.no_subtests_shortletter else short
+        return f"subtests {category}", short, f"{description} {status}"
+    elif report.passed:
         short = "" if config.option.no_subtests_shortletter else ","
         return f"subtests {outcome}", short, f"{description} SUBPASS"
     elif report.skipped:

tests/test_subtests.py

@@ -131,7 +131,7 @@ def test_foo(subtests):
             pytest.importorskip("xdist")
             result = pytester.runpytest("-n1")
             expected_lines = ["1 worker [1 item]"]
-        expected_lines += ["* 1 passed, 3 xfailed, 2 subtests passed in *"]
+        expected_lines += ["* 1 passed, 2 subtests passed, 3 subtests xfailed in *"]
         result.stdout.fnmatch_lines(expected_lines)
 
     def test_typing_exported(