From 6c6d47c89ced5ce25cf7536e49e291c0b5c36886 Mon Sep 17 00:00:00 2001 From: link2xt Date: Tue, 8 Feb 2022 20:50:11 +0000 Subject: [PATCH] Fix CI timeout_func_only makes pytest-rerunfailures work with pytest-timeout, but it only works with default timeout_method. See pytest-rerunfailures issue for details: https://github.com/pytest-dev/pytest-rerunfailures/issues/99 --- python/tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/tox.ini b/python/tox.ini index a0814fef8c..a8a37f3e2f 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -79,7 +79,7 @@ addopts = -v -ra --strict-markers norecursedirs = .tox xfail_strict=true timeout = 90 -timeout_method = thread +timeout_func_only = True markers = ignored: ignore this test in default test runs, use --ignored to run.