Merge pull request #9214 from nicoddemus/confcutdir-9210

This commit is contained in:
Bruno Oliveira 2021-10-19 06:52:52 -03:00 committed by GitHub
commit 20a69e11aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 11 deletions

1
changelog/9210.doc.rst Normal file
View File

@ -0,0 +1 @@
Remove incorrect docs about ``confcutdir`` being a configuration option: it can only be set through the ``--confcutdir`` command-line option.

View File

@ -1196,19 +1196,8 @@ passed multiple times. The expected format is ``name=value``. For example::
variables, that will be expanded. For more information about cache plugin
please refer to :ref:`cache_provider`.
.. confval:: confcutdir
Sets a directory where search upwards for ``conftest.py`` files stops.
By default, pytest will stop searching for ``conftest.py`` files upwards
from ``pytest.ini``/``tox.ini``/``setup.cfg`` of the project if any,
or up to the file-system root.
.. confval:: console_output_style
Sets the console output style while running tests:
* ``classic``: classic pytest output.