Skip to content

GH-111808: Make the default value for test.support.infinite_recursion() conditional on compiler optimizations #112223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettcannon merged 3 commits into from
Nov 17, 2023
Merged

GH-111808: Make the default value for test.support.infinite_recursion() conditional on compiler optimizations #112223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
840fcfc
GH-111808: Make the default value for `test.support.infinite_recursio…
brettcannon Nov 17, 2023
ba7e8c3
Update Lib/test/support/__init__.py
brettcannon Nov 17, 2023
d80eb5f
Merge branch 'main' into lower-default-infinite_recursion
brettcannon Nov 17, 2023
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
12 changes: 10 additions & 2 deletions Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2120,13 +2120,21 @@ def set_recursion_limit(limit):
finally:
sys.setrecursionlimit(original_limit)

def infinite_recursion(max_depth=100):
def infinite_recursion(max_depth=None):
"""Set a lower limit for tests that interact with infinite recursions
(e.g test_ast.ASTHelpers_Test.test_recursion_direct) since on some
debug windows builds, due to not enough functions being inlined the
stack size might not handle the default recursion limit (1000). See
bpo-11105 for details."""
if max_depth < 3:
if max_depth is None:
if not python_is_optimized() or Py_DEBUG:
# Python built without compiler optimizations or in debug mode
# usually consumes more stack memory per function call.
# Unoptimized number based on what works under a WASI debug build.
max_depth = 50
else:
max_depth = 100
elif max_depth < 3:
raise ValueError("max_depth must be at least 3, got {max_depth}")
depth = get_recursion_depth()
depth = max(depth - 1, 1) # Ignore infinite_recursion() frame.
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_richcmp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def do(bad):
self.assertRaises(Exc, func, Bad())

@support.no_tracing
@support.infinite_recursion(25)
@support.infinite_recursion()
def test_recursion(self):
# Check that comparison for recursive objects fails gracefully
from collections import UserList
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5621,7 +5621,7 @@ def fun(x: a): pass
def cmp(o1, o2):
return o1 == o2

with infinite_recursion(25): # magic number, small but reasonable
with infinite_recursion():
r1 = namespace1()
r2 = namespace2()
self.assertIsNot(r1, r2)
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Tests/2023-11-17-15-20-41.gh-issue-111808.jtIayt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Make the default value of ``test.support.infinite_recursion()`` to be
conditional based on whether optimizations were used when compiling the
interpreter. This helps with platforms like WASI whose stack size is greatly
restricted in debug builds.