Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-03-16 18:15:28 -03:00
parent cbb2c55dea 93847bfeb4
commit 1fff81e21d
45 changed files with 1455 additions and 724 deletions
@@ -144,11 +144,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: