Skip to content

Commit

Permalink
fix issue pytest-dev#2920
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland Puntaier committed Nov 28, 2017
1 parent 4d2f05e commit 4ea7bbc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion _pytest/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def import_plugin(self, modname):
# _pytest prefix.
assert isinstance(modname, (six.text_type, str)), "module name as text required, got %r" % modname
modname = str(modname)
if self.get_plugin(modname) is not None:
if self.is_blocked(modname) or self.get_plugin(modname) is not None:
return
if modname in builtin_plugins:
importspec = "_pytest." + modname
Expand Down

0 comments on commit 4ea7bbc

Please sign in to comment.