Skip to content

Commit 6473c3d

Browse files
author
Duncan Betts
committed
Improved description of functionality for Issue #687
1 parent 0735d45 commit 6473c3d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
* Add hint to error message hinting possible missing ``__init__.py`` (`#478`_). Thanks `@DuncanBetts`_.
55

6+
* More accurately describe when fixture finalization occurs in documentation (`#687`_). Thanks `@DuncanBetts`_.
7+
68
* Provide ``:ref:`` targets for ``recwarn.rst`` so we can use intersphinx referencing.
79
Thanks to `@dupuy`_ for the report and `@lwm`_ for the PR.
810

@@ -34,6 +36,7 @@
3436
.. _@nmundar: https://github.com/nmundar
3537

3638
.. _#478: https://github.com/pytest-dev/pytest/issues/478
39+
.. _#687: https://github.com/pytest-dev/pytest/issues/687
3740
.. _#2034: https://github.com/pytest-dev/pytest/issues/2034
3841
.. _#2038: https://github.com/pytest-dev/pytest/issues/2038
3942
.. _#2078: https://github.com/pytest-dev/pytest/issues/2078

doc/en/fixture.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,7 @@ the ``with`` statement ends.
318318
request.addfinalizer(fin)
319319
return smtp # provide the fixture value
320320

321-
The ``fin`` function will execute when the last test using
322-
the fixture in the module has finished execution.
321+
The ``fin`` function will execute when the last test in the module has finished execution.
323322

324323
This method is still fully supported, but ``yield`` is recommended from 2.10 onward because
325324
it is considered simpler and better describes the natural code flow.

0 commit comments

Comments
 (0)