From 169635e8899e60de8155ad151ff99f10c3652fa0 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 27 Jan 2018 11:02:32 -0200 Subject: [PATCH] Move example of empty_parameter_set_mark closer to the options --- doc/en/customize.rst | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/doc/en/customize.rst b/doc/en/customize.rst index 80efe6b83..9fe094ba1 100644 --- a/doc/en/customize.rst +++ b/doc/en/customize.rst @@ -357,16 +357,17 @@ passed multiple times. The expected format is ``name=value``. For example:: * ``skip`` skips tests with a empty parameterset (default) * ``xfail`` marks tests with a empty parameterset as xfail(run=False) - .. note:: - - it is planned to change the default to ``xfail`` in future releases - as this is considered less error prone. see `#3155`_ - .. code-block:: ini - # content of pytest.ini - [pytest] - empty_parameter_set_mark = xfail + # content of pytest.ini + [pytest] + empty_parameter_set_mark = xfail + + .. note:: + + The default value of this option is planned to change to ``xfail`` in future releases + as this is considered less error prone, see `#3155`_ for more details. -.. _`#3155`: https://github.com/pytest-dev/pytest/issues/3155 \ No newline at end of file + +.. _`#3155`: https://github.com/pytest-dev/pytest/issues/3155