Skip to content

Commit

Permalink
Fix wording as suggested in review of #5741
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Aug 15, 2019
1 parent d7f0825 commit 1049a38
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doc/en/skipping.rst
Expand Up @@ -180,7 +180,7 @@ Skipping on a missing import dependency
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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
Expand Down
2 changes: 1 addition & 1 deletion src/_pytest/outcomes.py
Expand Up @@ -161,7 +161,7 @@ def importorskip(
current test if the module cannot be imported.
: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
still skipped.
:param str reason: if given, this reason is shown as the message when the
Expand Down
2 changes: 1 addition & 1 deletion src/_pytest/pytester.py
Expand Up @@ -632,7 +632,7 @@ def mkpydir(self, name):
def copy_example(self, name=None):
"""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``).
"""
Expand Down

0 comments on commit 1049a38

Please sign in to comment.