Fix wording as suggested in review of #5741

This commit is contained in:
Bruno Oliveira 2019-08-15 10:05:42 -03:00
parent d7f082519a
commit 1049a38cee
3 changed files with 3 additions and 3 deletions

View File

@ -180,7 +180,7 @@ Skipping on a missing import dependency
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
You can skip tests on a missing import by using :ref:`pytest.importorskip ref` You can skip tests on a missing import by using :ref:`pytest.importorskip ref`
at module level or within a test or test setup function. at module level, within a test, or test setup function.
.. code-block:: python .. code-block:: python

View File

@ -161,7 +161,7 @@ def importorskip(
current test if the module cannot be imported. current test if the module cannot be imported.
:param str modname: the name of the module to import :param str modname: the name of the module to import
:param str minversion: if given, the imported module ``__version__`` :param str minversion: if given, the imported module's ``__version__``
attribute must be at least this minimal version, otherwise the test is attribute must be at least this minimal version, otherwise the test is
still skipped. still skipped.
:param str reason: if given, this reason is shown as the message when the :param str reason: if given, this reason is shown as the message when the

View File

@ -632,7 +632,7 @@ class Testdir:
def copy_example(self, name=None): def copy_example(self, name=None):
"""Copy file from project's directory into the testdir. """Copy file from project's directory into the testdir.
:param str name: The name of the file for copy. :param str name: The name of the file to copy.
:return: path to the copied directory (inside ``self.tmpdir``). :return: path to the copied directory (inside ``self.tmpdir``).
""" """