Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pytest_timeout.py
Original file line number Diff line number Diff line change
Expand Up @@ -408,13 +408,16 @@ def _parse_marker(marker):
if not marker.args and not marker.kwargs:
raise TypeError("Timeout marker must have at least one argument")
timeout = method = func_only = NOTSET = object() # noqa: N806
disable_debugger_detection = None
for kw, val in marker.kwargs.items():
if kw == "timeout":
timeout = val
elif kw == "method":
method = val
elif kw == "func_only":
func_only = val
elif kw == "disable_debugger_detection":
disable_debugger_detection = val
else:
msg = f"Invalid keyword argument for timeout marker: {kw}"
raise TypeError(msg)
Expand All @@ -434,7 +437,7 @@ def _parse_marker(marker):
method = None
if func_only is NOTSET:
func_only = None
return Settings(timeout, method, func_only, None)
return Settings(timeout, method, func_only, disable_debugger_detection)


def _validate_timeout(timeout, where):
Expand Down
16 changes: 16 additions & 0 deletions test_pytest_timeout.py
Original file line number Diff line number Diff line change
Expand Up @@ -729,3 +729,19 @@ def test_two():
result = pytester.runpytest_subprocess()
result.stdout.fnmatch_lines(["*!! session-timeout: 1.0 sec exceeded !!!*"])
result.assert_outcomes(passed=1)


@pytest.mark.parametrize("disabled", [True, False])
def test_debugger_detection_marker(pytester, disabled):
pytester.makepyfile(f"""
import pytest
import pytest_timeout

@pytest.mark.timeout(0, disable_debugger_detection={disabled})
def test_settings(request):
settings = pytest_timeout._get_item_settings(request.node)
assert settings.disable_debugger_detection is {disabled}
""")
result = pytester.runpytest_subprocess()
result.assert_outcomes(passed=1)
assert result.ret == 0