Skip to content

gh-76785: Fix Windows Refleak in test_interpreters #117913

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
merged 2 commits into from
Apr 16, 2024
Merged

gh-76785: Fix Windows Refleak in test_interpreters #117913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0786736
Drop unused code.
ericsnowcurrently Apr 15, 2024
c0e665b
Avoid importing test.support.os_helper in legacy interpreters.
ericsnowcurrently Apr 16, 2024
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
3 changes: 0 additions & 3 deletions Lib/test/test_interpreters/test_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,6 @@ def test_idempotent(self):

@requires_test_modules
def test_created_with_capi(self):
last = 0
for id, *_ in _interpreters.list_all():
last = max(last, id)
expected = _testinternalcapi.next_interpreter_id()
text = self.run_temp_from_capi(f"""
import {interpreters.__name__} as interpreters
Expand Down
10 changes: 7 additions & 3 deletions Lib/test/test_interpreters/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
import warnings

from test import support
from test.support import os_helper
from test.support import import_helper

_interpreters = import_helper.import_module('_xxsubinterpreters')
# We would use test.support.import_helper.import_module(),
# but the indirect import of test.support.os_helper causes refleaks.
try:
import _xxsubinterpreters as _interpreters
except ImportError as exc:
raise unittest.SkipTest(str(exc))
from test.support import interpreters


Expand Down Expand Up @@ -399,6 +402,7 @@ def ensure_closed(fd):
def temp_dir(self):
tempdir = tempfile.mkdtemp()
tempdir = os.path.realpath(tempdir)
from test.support import os_helper
self.addCleanup(lambda: os_helper.rmtree(tempdir))
return tempdir

Expand Down