Wrap yield's in try/finally

Signed-off-by: Pedro Algarvio <[email protected]>

Author: s0undt3ch

pytest_timeout.py

@@ -157,9 +157,11 @@ def pytest_runtest_protocol(item):
     is_timeout = settings.timeout is not None and settings.timeout > 0
     if is_timeout and settings.func_only is False:
         hooks.pytest_timeout_set_timer(item=item, settings=settings)
-    yield
-    if is_timeout and settings.func_only is False:
-        hooks.pytest_timeout_cancel_timer(item=item)
+    try:
+        yield
+    finally:
+        if is_timeout and settings.func_only is False:
+            hooks.pytest_timeout_cancel_timer(item=item)
 
 
 @pytest.hookimpl(hookwrapper=True)
@@ -174,9 +176,11 @@ def pytest_runtest_call(item):
     is_timeout = settings.timeout is not None and settings.timeout > 0
     if is_timeout and settings.func_only is True:
         hooks.pytest_timeout_set_timer(item=item, settings=settings)
-    yield
-    if is_timeout and settings.func_only is True:
-        hooks.pytest_timeout_cancel_timer(item=item)
+    try:
+        yield
+    finally:
+        if is_timeout and settings.func_only is True:
+            hooks.pytest_timeout_cancel_timer(item=item)
 
 
 @pytest.hookimpl(tryfirst=True)