Limit try-except scope in hookwrapper caller

pytest-dev · Jun 30, 2020 · bdc131a · bdc131a
1 parent f2ee87a
commit bdc131a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/pluggy/callers.py b/src/pluggy/callers.py
@@ -29,12 +29,14 @@ def _multicall(hook_impls, caller_kwargs, firstresult=False):
                             )
 
                 if hook_impl.hookwrapper:
+                    gen = hook_impl.function(*args)
+
                     try:
-                        gen = hook_impl.function(*args)
                         next(gen)  # first yield
-                        teardowns.append(gen)
                     except StopIteration:
                         _raise_wrapfail(gen, "did not yield")
+
+                    teardowns.append(gen)
                 else:
                     res = hook_impl.function(*args)
                     if res is not None: