Merge pull request #122 from ids1024/PluginValidationError-plugin

Add .plugin member to PluginValidationError to access failing plugin

Author: goodboy

pluggy/manager.py

@@ -4,7 +4,14 @@
 
 
 class PluginValidationError(Exception):
-    """ plugin failed validation. """
+    """ plugin failed validation. 
+
+    :param object plugin: the plugin which failed validation, may be a module or an arbitrary object.
+    """
+
+    def __init__(self, plugin, message):
+        self.plugin = plugin
+        super(Exception, self).__init__(message)
 
 
 class PluginManager(object):
@@ -178,13 +185,15 @@ def get_name(self, plugin):
     def _verify_hook(self, hook, hookimpl):
         if hook.is_historic() and hookimpl.hookwrapper:
             raise PluginValidationError(
+                hookimpl.plugin,
                 "Plugin %r\nhook %r\nhistoric incompatible to hookwrapper" %
                 (hookimpl.plugin_name, hook.name))
 
         # positional arg checking
         notinspec = set(hookimpl.argnames) - set(hook.argnames)
         if notinspec:
             raise PluginValidationError(
+                hookimpl.plugin,
                 "Plugin %r for hook %r\nhookimpl definition: %s\n"
                 "Argument(s) %s are declared in the hookimpl but "
                 "can not be found in the hookspec" %
@@ -202,6 +211,7 @@ def check_pending(self):
                     for hookimpl in (hook._wrappers + hook._nonwrappers):
                         if not hookimpl.optionalhook:
                             raise PluginValidationError(
+                                hookimpl.plugin,
                                 "unknown hook %r in plugin %r" %
                                 (name, hookimpl.plugin))
 

testing/test_pluginmanager.py

@@ -103,9 +103,12 @@ class hello(object):
         def he_method_notexists(self):
             pass
 
-    he_pm.register(hello())
-    with pytest.raises(PluginValidationError):
+    plugin = hello()
+
+    he_pm.register(plugin)
+    with pytest.raises(PluginValidationError) as excinfo:
         he_pm.check_pending()
+    assert excinfo.value.plugin is plugin
 
 
 def test_register_mismatch_arg(he_pm):
@@ -114,8 +117,11 @@ class hello(object):
         def he_method1(self, qlwkje):
             pass
 
-    with pytest.raises(PluginValidationError):
-        he_pm.register(hello())
+    plugin = hello()
+
+    with pytest.raises(PluginValidationError) as excinfo:
+        he_pm.register(plugin)
+    assert excinfo.value.plugin is plugin
 
 
 def test_register(pm):