summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2018-11-09 01:54:14 +0100
committerDaniel Hahler <git@thequod.de>2018-11-09 02:03:44 +0100
commitfeccf532d21f823243fb89364114ddd6a055e5b9 (patch)
tree459eb4e62619cd163f931d4b8bbaf4bd27505ce5
parent859b3227739d345bace43a309eb2d2a098bc9ce3 (diff)
downloadpytest-feccf532d21f823243fb89364114ddd6a055e5b9.tar.gz
doc: improve runpytest_subprocess
-rw-r--r--src/_pytest/pytester.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/_pytest/pytester.py b/src/_pytest/pytester.py
index ca24ff1b0..8d5a6b141 100644
--- a/src/_pytest/pytester.py
+++ b/src/_pytest/pytester.py
@@ -1160,11 +1160,11 @@ class Testdir(object):
def runpytest_subprocess(self, *args, **kwargs):
"""Run pytest as a subprocess with given arguments.
- Any plugins added to the :py:attr:`plugins` list will added using the
- ``-p`` command line option. Additionally ``--basetemp`` is used put
+ Any plugins added to the :py:attr:`plugins` list will be added using the
+ ``-p`` command line option. Additionally ``--basetemp`` is used to put
any temporary files and directories in a numbered directory prefixed
- with "runpytest-" so they do not conflict with the normal numbered
- pytest location for temporary files and directories.
+ with "runpytest-" to not conflict with the normal numbered pytest
+ location for temporary files and directories.
:param args: the sequence of arguments to pass to the pytest subprocess
:param timeout: the period in seconds after which to timeout and raise