Skip to content

Commit

Permalink
Add caplog to reference
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Mar 6, 2018
1 parent 111c6d6 commit adcb28f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
6 changes: 2 additions & 4 deletions doc/en/logging.rst
Expand Up @@ -160,11 +160,9 @@ the records for the ``setup`` and ``call`` stages during teardown like so:
pytest.fail('warning messages encountered during testing: {}'.format(messages))
caplog fixture API
~~~~~~~~~~~~~~~~~~
.. autoclass:: _pytest.logging.LogCaptureFixture
:members:
The full API is available at :class:`_pytest.logging.LogCaptureFixture`.


.. _live_logs:

Expand Down
13 changes: 12 additions & 1 deletion doc/en/reference.rst
Expand Up @@ -5,7 +5,7 @@ Reference
This page contains the full reference to pytest's API.

.. contents::
:depth: 2
:depth: 3
:local:


Expand Down Expand Up @@ -423,3 +423,14 @@ record_xml_property
~~~~~~~~~~~~~~~~~~~

.. autofunction:: _pytest.junitxml.record_xml_property()

caplog
~~~~~~

.. autofunction:: _pytest.logging.caplog()
:no-auto-options:

This returns a :class:`_pytest.logging.LogCaptureFixture`.

.. autoclass:: _pytest.logging.LogCaptureFixture
:members:

0 comments on commit adcb28f

Please sign in to comment.