diff --git a/changelog/6469.feature.rst b/changelog/6469.feature.rst index 4b05fdb33..3a2cfb0e0 100644 --- a/changelog/6469.feature.rst +++ b/changelog/6469.feature.rst @@ -1 +1 @@ -User can set ``junit_logging`` to one of ``no|log|system-out|system-err|out-err|all`` in order to put selected output in xml file. +New options have been added to the :confval:`junit_logging` option: ``log``, ``out-err``, and ``all``. diff --git a/doc/en/reference.rst b/doc/en/reference.rst index a72e59b17..7d4f1dafa 100644 --- a/doc/en/reference.rst +++ b/doc/en/reference.rst @@ -1164,9 +1164,17 @@ passed multiple times. The expected format is ``name=value``. For example:: .. confval:: junit_logging .. versionadded:: 3.5 + .. versionchanged:: 5.4 + ``log``, ``all``, ``out-err`` options added. - Configures if stdout/stderr should be written to the JUnit XML file. Valid values are - ``log``, ``out-err``, ``all``, ``system-out``, ``system-err``, and ``no`` (the default). + Configures if captured output should be written to the JUnit XML file. Valid values are: + + * ``log``: write only ``logging`` captured output. + * ``system-out``: write captured ``stdout`` contents. + * ``system-err``: write captured ``stderr`` contents. + * ``out-err``: write both captured ``stdout`` and ``stderr`` contents. + * ``all``: write captured ``logging``, ``stdout`` and ``stderr`` contents. + * ``no`` (the default): no captured output is written. .. code-block:: ini