Use pytest-timeout for tests

3 files changed, 19 insertions, 56 deletions

diff --git a/requirements_test_min.txt b/requirements_test_min.txt
index f577fbddc..83f1a8810 100644
--- a/requirements_test_min.txt
+++ b/requirements_test_min.txt
@@ -4,3 +4,4 @@ astroid==2.11.0  # Pinned to a specific version for tests
 typing-extensions~=4.1
 pytest~=7.0
 pytest-benchmark~=3.4
+pytest-timeout~=2.1
diff --git a/tests/checkers/unittest_refactoring.py b/tests/checkers/unittest_refactoring.py
index 760eb2fe8..86ed28a4d 100644
--- a/tests/checkers/unittest_refactoring.py
+++ b/tests/checkers/unittest_refactoring.py
@@ -2,8 +2,6 @@
 # For details: https://github.com/PyCQA/pylint/blob/main/LICENSE
 
 import os
-import signal
-from contextlib import contextmanager
 
 import pytest
 
@@ -14,36 +12,22 @@ PARENT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 REGR_DATA = os.path.join(PARENT_DIR, "regrtest_data")
 
 
-@contextmanager
-def timeout(timeout_s: float):
-    def _handle(_signum, _frame):
-        pytest.fail("Test took too long")
-
-    signal.signal(signal.SIGALRM, _handle)
-    signal.setitimer(signal.ITIMER_REAL, timeout_s)
-    yield
-    signal.setitimer(signal.ITIMER_REAL, 0)
-    signal.signal(signal.SIGALRM, signal.SIG_DFL)
-
-
-@pytest.mark.skipif(not hasattr(signal, "setitimer"), reason="Assumes POSIX signals")
+@pytest.mark.timeout(8)
 def test_process_tokens() -> None:
-    with timeout(8.0):
-        with pytest.raises(SystemExit) as cm:
-            Run([os.path.join(REGR_DATA, "very_long_line.py")], reporter=TextReporter())
-        assert cm.value.code == 0
+    with pytest.raises(SystemExit) as cm:
+        Run([os.path.join(REGR_DATA, "very_long_line.py")], reporter=TextReporter())
+    assert cm.value.code == 0
 
 
-@pytest.mark.skipif(not hasattr(signal, "setitimer"), reason="Assumes POSIX signals")
+@pytest.mark.timeout(25)
 def test_issue_5724() -> None:
     """Regression test for parsing of pylint disable pragma's."""
-    with timeout(25.0):
-        with pytest.raises(SystemExit) as cm:
-            Run(
-                [
-                    os.path.join(REGR_DATA, "issue_5724.py"),
-                    "--enable=missing-final-newline",
-                ],
-                reporter=TextReporter(),
-            )
-        assert cm.value.code == 0
+    with pytest.raises(SystemExit) as cm:
+        Run(
+            [
+                os.path.join(REGR_DATA, "issue_5724.py"),
+                "--enable=missing-final-newline",
+            ],
+            reporter=TextReporter(),
+        )
+    assert cm.value.code == 0
diff --git a/tests/test_regr.py b/tests/test_regr.py
index 3ece9c987..2980057c6 100644
--- a/tests/test_regr.py
+++ b/tests/test_regr.py
@@ -23,9 +23,7 @@ to be incorporated in the automatic functional test framework
 # pylint: disable=redefined-outer-name
 
 import os
-import signal
 import sys
-from contextlib import contextmanager
 from os.path import abspath, dirname, join
 from typing import Callable, Iterator, List, cast
 
@@ -154,27 +152,7 @@ def test_pylint_config_attr() -> None:
     assert inferred[0].name == "Values"
 
 
-@contextmanager
-def timeout(timeout_s: float):
-    def _handle(_signum, _frame):
-        pytest.fail("timed out")
-
-    signal.signal(signal.SIGALRM, _handle)
-    signal.setitimer(signal.ITIMER_REAL, timeout_s)
-    yield
-    signal.setitimer(signal.ITIMER_REAL, 0)
-    signal.signal(signal.SIGALRM, signal.SIG_DFL)
-
-
-@pytest.mark.skipif(not hasattr(signal, "setitimer"), reason="Assumes POSIX signals")
-@pytest.mark.parametrize(
-    "file_names,timeout_s",
-    [
-        ([join(REGR_DATA, "hang", "pkg4972.string")], 30.0),
-    ],
-)
-def test_hang(
-    finalize_linter: PyLinter, file_names: List[str], timeout_s: float
-) -> None:
-    with timeout(timeout_s):
-        finalize_linter.check(file_names)
+@pytest.mark.timeout(30)
+@pytest.mark.parametrize("file_names", ([join(REGR_DATA, "hang", "pkg4972.string")],))
+def test_hang(finalize_linter: PyLinter, file_names: List[str]) -> None:
+    finalize_linter.check(file_names)