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

Merge pull request #1719 from nicoddemus/fix-2.10-versions-in-docs 

Fix 2.10 -> 3.0 versions in docs
This commit is contained in:
Florian Bruhin 2016-07-13 08:10:13 +02:00 committed by GitHub
parent c4f20a1834 f827810fa8
commit 54ea27c283
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/assert.rst
View File

@ -85,7 +85,7 @@ and if you need to have access to the actual exception info you may use::
the actual exception raised. The main attributes of interest are the actual exception raised. The main attributes of interest are
``.type``, ``.value`` and ``.traceback``. ``.type``, ``.value`` and ``.traceback``.
.. versionchanged:: 2.10 .. versionchanged:: 3.0
In the context manager form you may use the keyword argument In the context manager form you may use the keyword argument
``message`` to specify a custom failure message:: ``message`` to specify a custom failure message::

2
doc/en/capture.rst
View File

@ -116,7 +116,7 @@ libraries or subprocesses that directly write to operating
system level output streams (FD1 and FD2). system level output streams (FD1 and FD2).
.. versionadded:: 2.10 .. versionadded:: 3.0
To temporarily disable capture within a test, both ``capsys`` To temporarily disable capture within a test, both ``capsys``
and ``capfd`` have a ``disabled()`` method that can be used and ``capfd`` have a ``disabled()`` method that can be used

2
doc/en/doctest.rst
View File

@ -105,7 +105,7 @@ itself::
The 'doctest_namespace' fixture The 'doctest_namespace' fixture
------------------------------- -------------------------------
.. versionadded:: 2.10 .. versionadded:: 3.0
The ``doctest_namespace`` fixture can be used to inject items into the The ``doctest_namespace`` fixture can be used to inject items into the
namespace in which your doctests run. It is intended to be used within namespace in which your doctests run. It is intended to be used within

2
doc/en/usage.rst
View File

@ -204,7 +204,7 @@ This will add an extra property ``example_key="1"`` to the generated
LogXML: add_global_property LogXML: add_global_property
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. versionadded:: 2.10 .. versionadded:: 3.0
If you want to add a properties node in the testsuite level, which may contains properties that are relevant If you want to add a properties node in the testsuite level, which may contains properties that are relevant
to all testcases you can use ``LogXML.add_global_properties`` to all testcases you can use ``LogXML.add_global_properties``

4
doc/en/yieldfixture.rst
View File

@ -3,12 +3,12 @@
"yield_fixture" functions "yield_fixture" functions
--------------------------------------------------------------- ---------------------------------------------------------------
.. deprecated:: 2.10 .. deprecated:: 3.0
.. versionadded:: 2.4 .. versionadded:: 2.4
.. important:: .. important::
Since pytest-2.10, fixtures using the normal ``fixture`` decorator can use a ``yield`` Since pytest-3.0, fixtures using the normal ``fixture`` decorator can use a ``yield``
statement to provide fixture values and execute teardown code, exactly like ``yield_fixture`` statement to provide fixture values and execute teardown code, exactly like ``yield_fixture``
in previous versions. in previous versions.