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

Allow providing a custom reason for `importorskip`

This commit is contained in:
Pedro Algarvio 2019-01-04 17:56:13 +00:00
parent 56aecfc081
commit 8b48621687
No known key found for this signature in database
GPG Key ID: BB36BF6584A298FF
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/outcomes.py
View File

@ -137,7 +137,7 @@ def xfail(reason=""):
xfail.Exception = XFailed xfail.Exception = XFailed
def importorskip(modname, minversion=None): def importorskip(modname, minversion=None, reason=None):
""" return imported module if it has at least "minversion" as its """ return imported module if it has at least "minversion" as its
__version__ attribute. If no minversion is specified the a skip __version__ attribute. If no minversion is specified the a skip
is only triggered if the module can not be imported. is only triggered if the module can not be imported.
@ -159,7 +159,9 @@ def importorskip(modname, minversion=None):
# Do not raise chained exception here(#1485) # Do not raise chained exception here(#1485)
should_skip = True should_skip = True
if should_skip: if should_skip:
raise Skipped("could not import %r" % (modname,), allow_module_level=True) if reason is None:
reason = "could not import %r" % (modname,)
raise Skipped(reason, allow_module_level=True)
mod = sys.modules[modname] mod = sys.modules[modname]
if minversion is None: if minversion is None:
return mod return mod