p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5887 from asottile/fix_attributes_docs_pytester 

Fix attribute docs in _pytest.pytester
This commit is contained in:
Florian Bruhin 2019-09-29 14:22:54 +02:00 committed by GitHub
parent b62276826c 07792c7113
commit 4d01740be3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/_pytest/pytester.py
View File

@ -351,15 +351,14 @@ class RunResult:
Attributes: Attributes:
:ret: the return value :ivar ret: the return value
:outlines: list of lines captured from stdout :ivar outlines: list of lines captured from stdout
:errlines: list of lines captures from stderr :ivar errlines: list of lines captured from stderr
:stdout: :py:class:`LineMatcher` of stdout, use ``stdout.str()`` to :ivar stdout: :py:class:`LineMatcher` of stdout, use ``stdout.str()`` to
reconstruct stdout or the commonly used ``stdout.fnmatch_lines()`` reconstruct stdout or the commonly used ``stdout.fnmatch_lines()``
method method
:stderr: :py:class:`LineMatcher` of stderr :ivar stderr: :py:class:`LineMatcher` of stderr
:duration: duration in seconds :ivar duration: duration in seconds
""" """
def __init__(self, ret, outlines, errlines, duration): def __init__(self, ret, outlines, errlines, duration):
@ -454,9 +453,9 @@ class Testdir:
Attributes: Attributes:
:tmpdir: The :py:class:`py.path.local` instance of the temporary directory. :ivar tmpdir: The :py:class:`py.path.local` instance of the temporary directory.
:plugins: A list of plugins to use with :py:meth:`parseconfig` and :ivar plugins: A list of plugins to use with :py:meth:`parseconfig` and
:py:meth:`runpytest`. Initially this is an empty list but plugins can :py:meth:`runpytest`. Initially this is an empty list but plugins can
be added to the list. The type of items to add to the list depends on be added to the list. The type of items to add to the list depends on
the method using them so refer to them for details. the method using them so refer to them for details.