Merge pull request #379 from vitek/spec-conflict

Detailed error message on hook registration conflict

Author: bluetech

src/pluggy/_hooks.py

@@ -357,7 +357,11 @@ def set_specification(
         specmodule_or_class: _Namespace,
         spec_opts: _HookSpecOpts,
     ) -> None:
-        assert not self.has_spec()
+        if self.spec is not None:
+            raise ValueError(
+                f"Hook {self.spec.name!r} is already registered "
+                f"within namespace {self.spec.namespace}"
+            )
         self.spec = HookSpec(specmodule_or_class, self.name, spec_opts)
         if spec_opts.get("historic"):
             self._call_history = []

testing/test_hookcaller.py

@@ -428,3 +428,23 @@ def hello(self, arg: int) -> int:
     pm.register(Plugin2())
     with pytest.raises(PluginValidationError):
         pm.check_pending()
+
+
+def test_hook_conflict(pm: PluginManager) -> None:
+    class Api1:
+        @hookspec
+        def conflict(self) -> None:
+            """Api1 hook"""
+
+    class Api2:
+        @hookspec
+        def conflict(self) -> None:
+            """Api2 hook"""
+
+    pm.add_hookspecs(Api1)
+    with pytest.raises(ValueError) as exc:
+        pm.add_hookspecs(Api2)
+    assert str(exc.value) == (
+        "Hook 'conflict' is already registered within namespace "
+        "<class 'test_hookcaller.test_hook_conflict.<locals>.Api1'>"
+    )