Skip to content

Commit

Permalink
Merge pull request pytest-dev#6242 from nicoddemus/testdir-changelog
Browse files Browse the repository at this point in the history
Add link to testdir fixture in CHANGELOG entry
  • Loading branch information
asottile committed Nov 25, 2019
2 parents a8230d7 + 0be03d7 commit 9d90093
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Features
rather than implicitly.


- `#5914 <https://github.com/pytest-dev/pytest/issues/5914>`_: ``pytester`` learned two new functions, `no_fnmatch_line <https://docs.pytest.org/en/latest/reference.html#_pytest.pytester.LineMatcher.no_fnmatch_line>`_ and
- `#5914 <https://github.com/pytest-dev/pytest/issues/5914>`_: `testdir <https://docs.pytest.org/en/latest/reference.html#testdir>`__ learned two new functions, `no_fnmatch_line <https://docs.pytest.org/en/latest/reference.html#_pytest.pytester.LineMatcher.no_fnmatch_line>`_ and
`no_re_match_line <https://docs.pytest.org/en/latest/reference.html#_pytest.pytester.LineMatcher.no_re_match_line>`_.

The functions are used to ensure the captured text *does not* match the given
Expand All @@ -77,12 +77,14 @@ Features

.. code-block:: python
result = testdir.runpytest()
assert re.match(pat, result.stdout.str()) is None
Or the ``in`` operator:

.. code-block:: python
result = testdir.runpytest()
assert text in result.stdout.str()
But the new functions produce best output on failure.
Expand Down

0 comments on commit 9d90093

Please sign in to comment.