chore: expand coverage by pragmas and test changes

Author: RonnyPfannschmidt

src/pluggy/__init__.py

@@ -1,10 +1,3 @@
-try:
-    from ._version import version as __version__
-except ImportError:
-    # broken installation, we don't even try
-    # unknown only works because we do poor mans version compare
-    __version__ = "unknown"
-
 __all__ = [
     "__version__",
     "PluginManager",
@@ -21,7 +14,6 @@
     "PluggyWarning",
     "PluggyTeardownRaisedWarning",
 ]
-
 from ._hooks import HookCaller
 from ._hooks import HookImpl
 from ._hooks import HookimplMarker
@@ -33,5 +25,6 @@
 from ._manager import PluginValidationError
 from ._result import HookCallError
 from ._result import Result
+from ._version import version as __version__
 from ._warnings import PluggyTeardownRaisedWarning
 from ._warnings import PluggyWarning

src/pluggy/_manager.py

@@ -188,11 +188,11 @@ def parse_hookimpl_opts(self, plugin: _Plugin, name: str) -> HookimplOpts | None
             res: HookimplOpts | None = getattr(
                 method, self.project_name + "_impl", None
             )
-        except Exception:
-            res = {}  # type: ignore[assignment]
+        except Exception: #pragma: no cover
+            res = {}  # type: ignore[assignment] #pragma: no cover
         if res is not None and not isinstance(res, dict):
             # false positive
-            res = None  # type:ignore[unreachable]
+            res = None  # type:ignore[unreachable] #pragma: no cover
         return res
 
     def unregister(

testing/conftest.py

@@ -14,7 +14,7 @@ def he_pm(request, pm: PluginManager) -> PluginManager:
     class Hooks:
         @hookspec
         def he_method1(self, arg: int) -> int:
-            return arg + 1
+            return arg + 1  # pragma: no cover
 
     pm.add_hookspecs(request.param(Hooks))
     return pm

testing/test_details.py

@@ -1,3 +1,5 @@
+from importlib.metadata import distribution
+
 import pytest
 
 from pluggy import HookimplMarker
@@ -20,7 +22,7 @@ def parse_hookimpl_opts(self, module_or_class, name):
 
     class Plugin:
         def x1meth(self):
-            pass
+            pass  # pragma: no cover
 
         @hookimpl(hookwrapper=True, tryfirst=True)
         def x1meth2(self):
@@ -33,15 +35,15 @@ def x1meth3(self):
     class Spec:
         @hookspec
         def x1meth(self):
-            pass
+            pass  # pragma: no cover
 
         @hookspec
         def x1meth2(self):
-            pass
+            pass  # pragma: no cover
 
         @hookspec
         def x1meth3(self):
-            pass
+            pass  # pragma: no cover
 
     pm = MyPluginManager(hookspec.project_name)
     pm.register(Plugin())
@@ -75,12 +77,12 @@ def test_warn_when_deprecated_specified(recwarn) -> None:
     class Spec:
         @hookspec(warn_on_impl=warning)
         def foo(self):
-            pass
+            pass  # pragma: no cover
 
     class Plugin:
         @hookimpl
         def foo(self):
-            pass
+            pass  # pragma: no cover
 
     pm = PluginManager(hookspec.project_name)
     pm.add_hookspecs(Spec)
@@ -136,10 +138,12 @@ def __getattr__(self, x):
             raise Exception("can't touch me")
 
     class Module:
-        pass
+        x: DontTouchMe
 
     module = Module()
-    module.x = DontTouchMe()  # type: ignore[attr-defined]
+    module.x = DontTouchMe()
+    with pytest.raises(Exception, match="touch me"):
+        module.x.broken
 
     pm = PluginManager(hookspec.project_name)
     # register() would raise an error
@@ -154,11 +158,11 @@ def test_not_all_arguments_are_provided_issues_a_warning(pm: PluginManager) -> N
     class Spec:
         @hookspec
         def hello(self, arg1, arg2):
-            pass
+            pass  # pragma: no cover
 
         @hookspec(historic=True)
         def herstory(self, arg1, arg2):
-            pass
+            pass  # pragma: no cover
 
     pm.add_hookspecs(Spec)
 
@@ -189,3 +193,12 @@ def myhook(self):
     assert repr(pm.hook.myhook.get_hookimpls()[0]) == (
         f"<HookImpl plugin_name={pname!r}, plugin={plugin!r}>"
     )
+
+
+def test_dist_facade_list_attributes() -> None:
+    from pluggy._manager import DistFacade
+
+    fc = DistFacade(distribution("pluggy"))
+    res = dir(fc)
+    assert res == sorted(res)
+    assert set(res) - set(dir(fc._dist)) == {"_dist", "project_name"}

testing/test_helpers.py

@@ -10,15 +10,15 @@
 
 def test_varnames() -> None:
     def f(x) -> None:
-        i = 3  # noqa
+        i = 3  # noqa #pragma: no cover
 
     class A:
         def f(self, y) -> None:
-            pass
+            pass  # pragma: no cover
 
     class B:
         def __call__(self, z) -> None:
-            pass
+            pass  # pragma: no cover
 
     assert varnames(f) == (("x",), ())
     assert varnames(A().f) == (("y",), ())
@@ -96,7 +96,7 @@ def test_varnames_decorator() -> None:
     def my_decorator(func: F) -> F:
         @wraps(func)
         def wrapper(*args, **kwargs):
-            return func(*args, **kwargs)
+            return func(*args, **kwargs)  # pragma: no cover
 
         return cast(F, wrapper)
 

testing/test_hookcaller.py

@@ -158,23 +158,23 @@ def he_method1_b() -> None:
 def test_adding_wrappers_ordering(hc: HookCaller, addmeth: AddMeth) -> None:
     @addmeth(hookwrapper=True)
     def he_method1():
-        yield
+        yield  # pragma: no cover
 
     @addmeth(wrapper=True)
     def he_method1_fun():
-        yield
+        yield  # pragma: no cover
 
     @addmeth()
     def he_method1_middle():
-        return
+        return  # pragma: no cover
 
     @addmeth(hookwrapper=True)
     def he_method3_fun():
-        yield
+        yield  # pragma: no cover
 
     @addmeth(hookwrapper=True)
     def he_method3():
-        yield
+        yield  # pragma: no cover
 
     assert funcs(hc.get_hookimpls()) == [
         he_method1_middle,
@@ -188,15 +188,15 @@ def he_method3():
 def test_adding_wrappers_ordering_tryfirst(hc: HookCaller, addmeth: AddMeth) -> None:
     @addmeth(hookwrapper=True, tryfirst=True)
     def he_method1():
-        yield
+        yield  # pragma: no cover
 
     @addmeth(hookwrapper=True)
     def he_method2():
-        yield
+        yield  # pragma: no cover
 
     @addmeth(wrapper=True, tryfirst=True)
     def he_method3():
-        yield
+        yield  # pragma: no cover
 
     assert funcs(hc.get_hookimpls()) == [he_method2, he_method1, he_method3]
 
@@ -206,7 +206,7 @@ def test_adding_wrappers_complex(hc: HookCaller, addmeth: AddMeth) -> None:
 
     @addmeth(hookwrapper=True, trylast=True)
     def m1():
-        yield
+        yield  # pragma: no cover
 
     assert funcs(hc.get_hookimpls()) == [m1]
 
@@ -227,7 +227,7 @@ def m4() -> None: ...
 
     @addmeth(wrapper=True, tryfirst=True)
     def m5():
-        yield
+        yield  # pragma: no cover
 
     assert funcs(hc.get_hookimpls()) == [m3, m2, m1, m4, m5]
 
@@ -243,7 +243,7 @@ def m7() -> None: ...
 
     @addmeth(wrapper=True)
     def m8():
-        yield
+        yield  # pragma: no cover
 
     assert funcs(hc.get_hookimpls()) == [m3, m2, m7, m6, m1, m4, m8, m5]
 
@@ -264,7 +264,7 @@ def m11() -> None: ...
 
     @addmeth(wrapper=True)
     def m12():
-        yield
+        yield  # pragma: no cover
 
     assert funcs(hc.get_hookimpls()) == [
         m9,
@@ -405,7 +405,7 @@ def hello(self, arg: object) -> None:
     class Plugin:
         @hookimpl(specname="hello")
         def foo(self, arg: int, too, many, args) -> int:
-            return arg + 1
+            return arg + 1  # pragma: no cover
 
     with pytest.raises(PluginValidationError):
         pm.register(Plugin())
@@ -415,7 +415,7 @@ def foo(self, arg: int, too, many, args) -> int:
     class Plugin2:
         @hookimpl(specname="bar")
         def hello(self, arg: int) -> int:
-            return arg + 1
+            return arg + 1  # pragma: no cover
 
     pm.register(Plugin2())
     with pytest.raises(PluginValidationError):

testing/test_invocations.py

@@ -133,7 +133,7 @@ def hello(self, arg):
     class Plugin1:
         @hookimpl
         def hello(self, arg):
-            return arg + 1
+            return arg + 1  # pragma: no cover
 
     class Plugin2:
         @hookimpl

testing/test_multicall.py

@@ -55,7 +55,7 @@ def f(x, z=1):
 def test_tags_call_error() -> None:
     @hookimpl
     def f(x):
-        return x
+        return x  # pragma: no cover
 
     with pytest.raises(HookCallError):
         MC([f], {})
@@ -331,7 +331,7 @@ def m1():
             raise
         finally:
             out.append("m1 finish")
-        return result
+        return result  # pragma: no cover
 
     @hookimpl
     def m2():
@@ -358,7 +358,7 @@ def m2():
     @hookimpl(wrapper=True)
     def m3():
         yield
-        return 10
+        return 10  # pragma: no cover
 
     @hookimpl(wrapper=True)
     def m4():
@@ -384,7 +384,7 @@ def m1():
         out.append("m1 init")
         try:
             yield
-            out.append("m1 unreachable")
+            out.append("m1 unreachable")  # pragma: no cover
         except BaseException:
             out.append("m1 teardown")
             raise
@@ -459,7 +459,7 @@ def m2():
         out.append("m2 init")
         try:
             yield
-            out.append("m2 unreachable")
+            out.append("m2 unreachable")  # pragma: no cover
         except ValueError:
             out.append("m2 suppress")
             return 22