Merge pull request #2964 from rpuntaie/master

fix issue #2920
2017-11-29 10:32:28 +01:00
parent 191e8c6d9b 5f1a7330b2
commit 88ed1ab648
5 changed files with 18 additions and 7 deletions
--- a/_pytest/config.py
+++ b/_pytest/config.py
@@ -417,7 +417,7 @@ class PytestPluginManager(PluginManager):
        # _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