Handle exceptions in hookwrapper post stage (pytest-dev#244)

maxnikulin · Jun 30, 2020 · f2ee87a · f2ee87a
1 parent 0a678db
commit f2ee87a
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/pluggy/callers.py b/src/pluggy/callers.py
@@ -52,9 +52,17 @@ def _multicall(hook_impls, caller_kwargs, firstresult=False):
         # run all wrapper post-yield blocks
         for gen in reversed(teardowns):
             try:
-                gen.send(outcome)
-                _raise_wrapfail(gen, "has second yield")
-            except StopIteration:
-                pass
+                try:
+                    gen.send(outcome)
+                    _raise_wrapfail(gen, "has second yield")
+                except StopIteration:
+                    pass
+                finally:
+                    # Exception is risen only if generator
+                    # suppresses GeneratorExit exception and yield
+                    # so _raise_wrapfail above is necessary
+                    gen.close()
+            except BaseException:
+                outcome._excinfo = sys.exc_info()
 
         return outcome.get_result()