floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1819 from matthiasha/patch-1 

Documentation update for rootdir discovery
This commit is contained in:
Bruno Oliveira 2016-08-19 17:36:44 -03:00 committed by GitHub
parent 3e685d6a8d c8fbf3ae34
commit 5ecf3d78f1
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -78,6 +78,7 @@ Martijn Faassen
Martin Prusse Martin Prusse
Martin K. Scherer Martin K. Scherer
Matt Bachmann Matt Bachmann
Matthias Hafner
Michael Aquilina Michael Aquilina
Michael Birtwell Michael Birtwell
Michael Droettboom Michael Droettboom

4
CHANGELOG.rst
View File

@ -38,7 +38,8 @@
* Refined logic for determining the ``rootdir``, considering only valid * Refined logic for determining the ``rootdir``, considering only valid
paths which fixes a number of issues: `#1594`_, `#1435`_ and `#1471`_. paths which fixes a number of issues: `#1594`_, `#1435`_ and `#1471`_.
Thanks to `@blueyed`_ and `@davehunt`_ for the PR. Updated the documentation according to current behavior. Thanks to
`@blueyed`_, `@davehunt`_ and `@matthiasha`_ for the PR.
* Always include full assertion explanation. The previous behaviour was hiding * Always include full assertion explanation. The previous behaviour was hiding
sub-expressions that happened to be False, assuming this was redundant information. sub-expressions that happened to be False, assuming this was redundant information.
@ -126,6 +127,7 @@
.. _@Stranger6667: https://github.com/Stranger6667 .. _@Stranger6667: https://github.com/Stranger6667
.. _@taschini: https://github.com/taschini .. _@taschini: https://github.com/taschini
.. _@Vogtinator: https://github.com/Vogtinator .. _@Vogtinator: https://github.com/Vogtinator
.. _@matthiasha: https://github.com/matthiasha
2.9.2 2.9.2

10
doc/en/customize.rst
View File

@ -48,6 +48,16 @@ Here is the algorithm which finds the rootdir from ``args``:
directory. This allows to work with pytest in structures that are not part of directory. This allows to work with pytest in structures that are not part of
a package and don't have any particular ini-file configuration. a package and don't have any particular ini-file configuration.
If no ``args`` are given, pytest collects test below the current working
directory and also starts determining the rootdir from there.
:warning: custom pytest plugin commandline arguments may include a path, as in
``pytest --log-output ../../test.log args``. Then ``args`` is mandatory,
otherwise pytest uses the folder of test.log for rootdir determination
(see also `issue 1435 <https://github.com/pytest-dev/pytest/issues/1435>`_).
A dot ``.`` for referencing to the current working directory is also
possible.
Note that an existing ``pytest.ini`` file will always be considered a match, Note that an existing ``pytest.ini`` file will always be considered a match,
whereas ``tox.ini`` and ``setup.cfg`` will only match if they contain a whereas ``tox.ini`` and ``setup.cfg`` will only match if they contain a
``[pytest]`` section. Options from multiple ini-files candidates are never ``[pytest]`` section. Options from multiple ini-files candidates are never