Add "verbosity_subtests" option and revamp tests

Author: nicoddemus

doc/en/reference/reference.rst

@@ -2066,8 +2066,26 @@ passed multiple times. The expected format is ``name=value``. For example::
         [pytest]
         verbosity_assertions = 2
 
-    Defaults to application wide verbosity level (via the ``-v`` command-line option). A special value of
-    "auto" can be used to explicitly use the global verbosity level.
+    If not set, defaults to application wide verbosity level (via the ``-v`` command-line option). A special value of
+    ``"auto"`` can be used to explicitly use the global verbosity level.
+
+
+.. confval:: verbosity_subtests
+
+    Set the verbosity level specifically for **passed** subtests.
+
+    .. code-block:: ini
+
+        [pytest]
+        verbosity_subtests = 1
+
+    A value of ``1`` or higher will show output for **passed** subtests (**failed** subtests are always reported).
+    Passed subtests output can be suppressed with the value ``0``, which overwrites the ``-v`` command-line option.
+
+    If not set, defaults to application wide verbosity level (via the ``-v`` command-line option). A special value of
+    ``"auto"`` can be used to explicitly use the global verbosity level.
+
+    See also: :ref:`subtests`.
 
 
 .. confval:: verbosity_test_cases
@@ -2079,8 +2097,8 @@ passed multiple times. The expected format is ``name=value``. For example::
         [pytest]
         verbosity_test_cases = 2
 
-    Defaults to application wide verbosity level (via the ``-v`` command-line option). A special value of
-    "auto" can be used to explicitly use the global verbosity level.
+    If not set, defaults to application wide verbosity level (via the ``-v`` command-line option). A special value of
+    ``"auto"`` can be used to explicitly use the global verbosity level.
 
 
 .. confval:: xfail_strict

src/_pytest/config/__init__.py

@@ -1772,6 +1772,9 @@ def getvalueorskip(self, name: str, path=None):
     VERBOSITY_ASSERTIONS: Final = "assertions"
     #: Verbosity type for test case execution (see :confval:`verbosity_test_cases`).
     VERBOSITY_TEST_CASES: Final = "test_cases"
+    #: Verbosity type for failed subtests (see :confval:`verbosity_subtests`).
+    VERBOSITY_SUBTESTS: Final = "subtests"
+
     _VERBOSITY_INI_DEFAULT: Final = "auto"
 
     def get_verbosity(self, verbosity_type: str | None = None) -> int:

src/_pytest/subtests.py

@@ -44,20 +44,13 @@
 
 
 def pytest_addoption(parser: Parser) -> None:
-    group = parser.getgroup("subtests")
-    group.addoption(
-        "--no-subtests-shortletter",
-        action="store_true",
-        dest="no_subtests_shortletter",
-        default=False,
-        help="Disables subtest output 'dots' in non-verbose mode (EXPERIMENTAL)",
-    )
-    group.addoption(
-        "--no-subtests-reports",
-        action="store_true",
-        dest="no_subtests_reports",
-        default=False,
-        help="Disables subtest output unless it's a failed subtest (EXPERIMENTAL)",
+    Config._add_verbosity_ini(
+        parser,
+        Config.VERBOSITY_SUBTESTS,
+        help=(
+            "Specify verbosity level for subtests. "
+            "Higher levels will generate output for passed subtests. Failed subtests are always reported."
+        ),
     )
 
 
@@ -372,14 +365,14 @@ def pytest_report_teststatus(
     if report.when != "call":
         return None
 
+    quiet = config.get_verbosity(Config.VERBOSITY_SUBTESTS) == 0
     if isinstance(report, SubtestReport):
         outcome = report.outcome
         description = report._sub_test_description()
-        no_output = ("", "", "")
 
         if hasattr(report, "wasxfail"):
-            if config.option.no_subtests_reports and outcome != "skipped":
-                return no_output
+            if quiet:
+                return "", "", ""
             elif outcome == "skipped":
                 category = "xfailed"
                 short = "y"  # x letter is used for regular xfail, y for subtest xfail
@@ -394,26 +387,28 @@ def pytest_report_teststatus(
                 # 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}"
-
-        if config.option.no_subtests_reports and outcome != "failed":
-            return no_output
-        elif report.passed:
-            short = "" if config.option.no_subtests_shortletter else ","
-            return f"subtests {outcome}", short, f"{description} SUBPASSED"
-        elif report.skipped:
-            short = "" if config.option.no_subtests_shortletter else "-"
-            return outcome, short, f"{description} SUBSKIPPED"
-        elif outcome == "failed":
-            short = "" if config.option.no_subtests_shortletter else "u"
-            return outcome, short, f"{description} SUBFAILED"
+            return category, short, f"{status}{description}"
+
+        if report.failed:
+            return outcome, "u", f"SUBFAILED{description}"
+        else:
+            if report.passed:
+                if quiet:
+                    return "", "", ""
+                else:
+                    return f"subtests {outcome}", "u", f"SUBPASSED{description}"
+            elif report.skipped:
+                if quiet:
+                    return "", "", ""
+                else:
+                    return outcome, "-", f"SUBSKIPPED{description}"
+
     else:
         failed_subtests_count = config.stash[failed_subtests_key][report.nodeid]
-        # Top-level test, fail it it contains failed subtests and it has passed.
+        # Top-level test, fail if it contains failed subtests and it has passed.
         if report.passed and failed_subtests_count > 0:
             report.outcome = "failed"
             suffix = "s" if failed_subtests_count > 1 else ""
-            report.longrepr = f"Contains {failed_subtests_count} failed subtest{suffix}"
+            report.longrepr = f"contains {failed_subtests_count} failed subtest{suffix}"
 
     return None

src/_pytest/terminal.py

@@ -1527,9 +1527,13 @@ def _get_line_with_reprcrash_message(
     line = f"{word} {node}"
     line_width = wcswidth(line)
 
+    msg: str | None
     try:
-        # Type ignored intentionally -- possible AttributeError expected.
-        msg = rep.longrepr.reprcrash.message  # type: ignore[union-attr]
+        if isinstance(rep.longrepr, str):
+            msg = rep.longrepr
+        else:
+            # Type ignored intentionally -- possible AttributeError expected.
+            msg = rep.longrepr.reprcrash.message  # type: ignore[union-attr]
     except AttributeError:
         pass
     else:

src/pytest/__init__.py

@@ -71,6 +71,7 @@
 from _pytest.runner import CallInfo
 from _pytest.stash import Stash
 from _pytest.stash import StashKey
+from _pytest.subtests import SubtestReport
 from _pytest.subtests import Subtests
 from _pytest.terminal import TerminalReporter
 from _pytest.terminal import TestShortLogReport
@@ -149,6 +150,7 @@
     "Session",
     "Stash",
     "StashKey",
+    "SubtestReport",
     "Subtests",
     "TempPathFactory",
     "TempdirFactory",