Skip to content

Commit d1b1edf

Browse files
committed
Unconditionally pytest.skip("DEADLOCK") for PyPy Windows
1 parent 0073ae9 commit d1b1edf

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tests/test_gil_scoped.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import pytest
77

8+
import env
89
from pybind11_tests import gil_scoped as m
910

1011

@@ -181,7 +182,7 @@ def _run_in_process(target, *args, **kwargs):
181182
elif process.exitcode is None:
182183
assert t_delta > 0.9 * timeout
183184
msg = "DEADLOCK, most likely, exactly what this test is meant to detect."
184-
if SKIP_IF_DEADLOCK:
185+
if SKIP_IF_DEADLOCK or (env.PYPY and env.WIN):
185186
pytest.skip(msg)
186187
raise RuntimeError(msg)
187188
return process.exitcode

0 commit comments

Comments
 (0)