fixup

Author: xoviat

.gitignore

@@ -58,3 +58,4 @@ docs/_build/
 
 # IDE
 .idea
+.vscode

pytest_timeout.py

@@ -14,11 +14,9 @@
 import time
 import threading
 import traceback
+import pytest
 from collections import namedtuple
 from distutils.version import LooseVersion
-from threading import current_thread, main_thread
-from _pytest.config import ExitCode
-from _pytest.outcomes import Failed
 
 import py
 import pytest
@@ -200,7 +198,9 @@ def timeout_setup(item):
         return
 
     timeout_method = params.method
-    if timeout_method == "signal" and not (current_thread() is main_thread()):
+    if timeout_method == "signal" and (
+        threading.current_thread() is not threading.main_thread()
+    ):
         timeout_method = "thread"
 
     if timeout_method == "signal":
@@ -216,7 +216,10 @@ def cancel():
         signal.signal(signal.SIGALRM, handler)
         signal.setitimer(signal.ITIMER_REAL, params.timeout)
     elif timeout_method == "thread":
-        timer = threading.Timer(params.timeout, timeout_timer, (item, params.timeout, current_thread()))
+        timer = threading.Timer(
+            params.timeout, timeout_timer,
+            (item, params.timeout, threading.current_thread()),
+        )
         timer.name = "%s %s" % (__name__, item.nodeid)
 
         def cancel():
@@ -424,13 +427,13 @@ def timeout_timer(item, timeout, thread):
         sys.stdout.flush()
         sys.stderr.flush()
 
-    for _ in range(10):
-        ctypes.pythonapi.PyThreadState_SetAsyncExc(
-            ctypes.c_long(thread.ident), ctypes.py_object(Failed),
-        )
-        time.sleep(0.5)
+        for _ in range(10):
+            ctypes.pythonapi.PyThreadState_SetAsyncExc(
+                ctypes.c_long(thread.ident), ctypes.py_object(pytest.fail.Exception),
+            )
+            time.sleep(0.5)
 
-    os._exit(1)
+        os._exit(1)
 
 
 def dump_stacks():