WIP: need to change pluggy as well

Author: nicoddemus

src/_pytest/config/__init__.py

@@ -518,6 +518,8 @@ def import_plugin(self, modname):
         assert isinstance(modname, six.string_types), (
             "module name as text required, got %r" % modname
         )
+        from pkg_resources import iter_entry_points, DistributionNotFound
+
         modname = str(modname)
         if self.is_blocked(modname) or self.get_plugin(modname) is not None:
             return
@@ -526,29 +528,40 @@ def import_plugin(self, modname):
         else:
             importspec = modname
         self.rewrite_hook.mark_rewrite(importspec)
-        try:
-            __import__(importspec)
-        except ImportError as e:
-            new_exc_type = ImportError
-            new_exc_message = 'Error importing plugin "%s": %s' % (
-                modname,
-                safe_str(e.args[0]),
-            )
-            new_exc = new_exc_type(new_exc_message)
+        mod = None
+        # TODO: this needs to be moved to pluggy so it can update its _plugin_distinfo attribute
+        eps = list(iter_entry_points("pytest11", modname))
+        if eps:
+            try:
+                mod = eps[0].load()
+            except DistributionNotFound:
+                pass
+        else:
+            try:
+                __import__(importspec)
+                mod = sys.modules[importspec]
+            except ImportError as e:
+                new_exc_message = 'Error importing plugin "%s": %s' % (
+                    modname,
+                    safe_str(e.args[0]),
+                )
+                new_exc = ImportError(new_exc_message)
+                tb = sys.exc_info()[2]
 
-            six.reraise(new_exc_type, new_exc, sys.exc_info()[2])
+                six.reraise(ImportError, new_exc, tb)
 
-        except Skipped as e:
-            from _pytest.warnings import _issue_warning_captured
+            except Skipped as e:
+                from _pytest.warnings import _issue_warning_captured
 
-            _issue_warning_captured(
-                PytestWarning("skipped plugin %r: %s" % (modname, e.msg)),
-                self.hook,
-                stacklevel=1,
-            )
-        else:
-            mod = sys.modules[importspec]
-            self.register(mod, modname)
+                _issue_warning_captured(
+                    PytestWarning("skipped plugin %r: %s" % (modname, e.msg)),
+                    self.hook,
+                    stacklevel=1,
+                )
+                return
+
+        assert mod is not None
+        self.register(mod, modname)
 
 
 def _get_plugin_specs_as_list(specs):

testing/acceptance_test.py

@@ -108,6 +108,38 @@ def test_option(pytestconfig):
         assert result.ret == 0
         result.stdout.fnmatch_lines(["*1 passed*"])
 
+    def test_early_load_setuptools_name(self, testdir, monkeypatch):
+        # WIP
+        pkg_resources = pytest.importorskip("pkg_resources")
+
+        testdir.makepyfile(mytestplugin_module="")
+        testdir.syspathinsert()
+
+        def my_iter(group, name=None):
+            if group == "pytest11" and name == EntryPoint.name:
+                return [EntryPoint()]
+            return []
+
+        class EntryPoint(object):
+            name = "myplugin"
+            loaded = False
+
+            def load(self):
+                type(self).loaded = True
+                __import__("mytestplugin_module")
+                return sys.modules["mytestplugin_module"]
+
+            @property
+            def dist(self):
+                return self
+
+            def _get_metadata(self, *args):
+                return []
+
+        monkeypatch.setattr(pkg_resources, "iter_entry_points", my_iter)
+        testdir.runpytest("-p", "myplugin")
+        assert EntryPoint.loaded
+
     def test_assertion_magic(self, testdir):
         p = testdir.makepyfile(
             """