switch to thread timeout method when not on main-thread (#88)

Author: xoviat

.gitignore

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

README.rst

@@ -218,6 +218,12 @@ session using ```--pdb``` or similar.
 Changelog
 =========
 
+2.0.0
+-----
+
+- Use thread timeout method when plugin is not called from main
+  thread to avoid crash.
+
 1.4.2
 -----
 

pytest_timeout.py

@@ -193,7 +193,15 @@ def timeout_setup(item):
     params = get_params(item)
     if params.timeout is None or params.timeout <= 0:
         return
-    if params.method == "signal":
+
+    timeout_method = params.method
+    if (
+        timeout_method == "signal"
+        and threading.current_thread() is not threading.main_thread()
+    ):
+        timeout_method = "thread"
+
+    if timeout_method == "signal":
 
         def handler(signum, frame):
             __tracebackhide__ = True
@@ -206,7 +214,7 @@ def cancel():
         item.cancel_timeout = cancel
         signal.signal(signal.SIGALRM, handler)
         signal.setitimer(signal.ITIMER_REAL, params.timeout)
-    elif params.method == "thread":
+    elif timeout_method == "thread":
         timer = threading.Timer(params.timeout, timeout_timer, (item, params.timeout))
         timer.name = "%s %s" % (__name__, item.nodeid)
 

test_pytest_timeout.py

@@ -482,3 +482,27 @@ def custom_trace(*args):
     module.custom_trace = custom_trace
 
     assert pytest_timeout.is_debugging(custom_trace)
+
+
+def test_not_main_thread(testdir):
+    testdir.makepyfile(
+        """
+        import threading
+        import pytest_timeout
+
+        current_timeout_setup = pytest_timeout.timeout_setup
+
+        def new_timeout_setup(item):
+            threading.Thread(
+                target=current_timeout_setup, args=(item),
+            ).join()
+
+        pytest_timeout.timeout_setup = new_timeout_setup
+
+        def test_x(): pass
+    """
+    )
+    result = testdir.runpytest("--timeout=1")
+    result.stdout.fnmatch_lines(
+        ["timeout: 1.0s", "timeout method:*", "timeout func_only:*"]
+    )