Merge pull request #3437 from nicoddemus/mark-changelog

Improve changelog note about markers
2018-05-02 06:45:39 +02:00 · 2018-05-02 06:45:39 +02:00 · 7834b45002
parent 5ba0663827 ccaa979f27
commit 7834b45002
3 changed files with 6 additions and 4 deletions
--- a/changelog/3317.feature
+++ b/changelog/3317.feature
@ -1 +1,3 @@
-introduce correct per node mark handling and deprecate the always incorrect existing mark handling
+Revamp the internals of the ``pytest.mark`` implementation with correct per node handling and introduce a new ``Node.iter_markers``
+API for mark iteration over nodes which fixes a number of long standing bugs caused by the old approach. More details can be
+found in `the marks documentation <https://docs.pytest.org/en/latest/mark.html#marker-revamp-and-iteration>`_.
--- a/doc/en/contents.rst
+++ b/doc/en/contents.rst
@ -15,12 +15,12 @@ Full pytest documentation
   existingtestsuite
   assert
   fixture
+   mark
   monkeypatch
   tmpdir
   capture
   warnings
   doctest
-   mark
   skipping
   parametrize
   cache
--- a/doc/en/mark.rst
+++ b/doc/en/mark.rst
@ -34,8 +34,8 @@ which also serve as documentation.

 .. `marker-iteration`

-Marker iteration
-=================
+Marker revamp and iteration
+---------------------------

 .. versionadded:: 3.6