From 018b290faa73eba66abfa93b84c95530724abd5f Mon Sep 17 00:00:00 2001 From: Patrick Lannigan Date: Sat, 2 Dec 2023 16:57:30 -0500 Subject: [PATCH] Consolidate changelog and correct typo --- changelog/11387.feature.rst | 1 + changelog/11639.feature.rst | 5 ----- doc/en/how-to/output.rst | 2 +- doc/en/reference/reference.rst | 4 ++-- 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 changelog/11639.feature.rst diff --git a/changelog/11387.feature.rst b/changelog/11387.feature.rst index 90f20885b..6fe1256f9 100644 --- a/changelog/11387.feature.rst +++ b/changelog/11387.feature.rst @@ -1,4 +1,5 @@ Added the new :confval:`verbosity_assertions` configuration option for fine-grained control of failed assertions verbosity. +Added the new :confval:`verbosity_test_cases` configuration option for fine-grained control of test execution verbosity. See :ref:`Fine-grained verbosity ` for more details. diff --git a/changelog/11639.feature.rst b/changelog/11639.feature.rst deleted file mode 100644 index 2c83f798b..000000000 --- a/changelog/11639.feature.rst +++ /dev/null @@ -1,5 +0,0 @@ -Added the new :confval:`verbosity_test_case` configuration option for fine-grained control of failed assertions verbosity. - -See :ref:`Fine-grained verbosity ` for more details. - -For plugin authors, :attr:`config.get_verbosity ` can be used to retrieve the verbosity level for a specific verbosity type. diff --git a/doc/en/how-to/output.rst b/doc/en/how-to/output.rst index d24e98f9b..c5061ed28 100644 --- a/doc/en/how-to/output.rst +++ b/doc/en/how-to/output.rst @@ -298,7 +298,7 @@ This is done by setting a verbosity level in the configuration file for the spec ``pytest --no-header`` with a value of ``2`` would have the same output as the previous example, but each test inside the file is shown by a single character in the output. -:confval:`verbosity_test_case`: Controls how verbose the test execution output should be when pytest is executed. +:confval:`verbosity_test_cases`: Controls how verbose the test execution output should be when pytest is executed. Running ``pytest --no-header`` with a value of ``2`` would have the same output as the first verbosity example, but each test inside the file gets its own line in the output. diff --git a/doc/en/reference/reference.rst b/doc/en/reference/reference.rst index 4d5e1b381..bcbf99018 100644 --- a/doc/en/reference/reference.rst +++ b/doc/en/reference/reference.rst @@ -1835,14 +1835,14 @@ passed multiple times. The expected format is ``name=value``. For example:: "auto" can be used to explicitly use the global verbosity level. -.. confval:: verbosity_test_case +.. confval:: verbosity_test_cases Set a verbosity level specifically for test case execution related output, overriding the application wide level. .. code-block:: ini [pytest] - verbosity_test_case = 2 + 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.