Skip to content

gh-102251: Updates to test_imp Toward Fixing Some Refleaks #102254

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
ericsnowcurrently merged 17 commits into from
Feb 27, 2023
Merged

gh-102251: Updates to test_imp Toward Fixing Some Refleaks #102254

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2be855c
Stop skipping the tests.
ericsnowcurrently Feb 17, 2023
9bbedda
_modules_by_index_clear() -> _modules_by_index_clear_one().
ericsnowcurrently Feb 17, 2023
83f42d6
Add an explanation of what happens when extensions are loaded.
ericsnowcurrently Feb 17, 2023
828a734
Add _forget_extension().
ericsnowcurrently Feb 17, 2023
e9096cd
Clean up test_singlephase_multiple_interpreters.
ericsnowcurrently Feb 17, 2023
c993f97
Add another test case.
ericsnowcurrently Feb 17, 2023
cc5c771
Expand test_singlephase_multiple_interpreters.
ericsnowcurrently Feb 18, 2023
08741b8
Clean up the tests.
ericsnowcurrently Feb 22, 2023
31716e9
Clean up clear_singlephase_extension().
ericsnowcurrently Feb 22, 2023
2c3dd42
Add a check.
ericsnowcurrently Feb 22, 2023
a353e7e
Fix a typo.
ericsnowcurrently Feb 22, 2023
c6a39e3
script -> snapshot_script.
ericsnowcurrently Feb 22, 2023
0c65700
Use spec_from_file_location() in imp.load_dynamic().
ericsnowcurrently Feb 22, 2023
993484e
Update single-phase-init tests.
ericsnowcurrently Feb 23, 2023
fc94060
Do the initial cleanup in setUpClass().
ericsnowcurrently Feb 24, 2023
3e2a1dd
Move the requires_load_dynamic decorator to the class.
ericsnowcurrently Feb 25, 2023
f0ce607
For now, skip the tests during refleak detection.
ericsnowcurrently Feb 25, 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
Prev Previous commit
Next Next commit
Add another test case.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Feb 17, 2023
commit c993f970782a823519e74e554087eba1f720ab4f
79 changes: 79 additions & 0 deletions Lib/test/test_imp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,8 @@ def test_singlephase_multiple_interpreters(self):
# This single-phase module has global state, which is shared
# by all interpreters.
import _testsinglephase
name = _testsinglephase.__name__
filename = _testsinglephase.__file__

# Start and end clean.
_forget_extension(_testsinglephase)
Expand All @@ -334,6 +336,15 @@ def test_singlephase_multiple_interpreters(self):
self.addCleanup(_interpreters.destroy, interp1)
interp2 = _interpreters.create(isolated=False)
self.addCleanup(_interpreters.destroy, interp2)
for interpid in [interp1, interp2]:
_interpreters.run_string(interpid, 'import _testinternalcapi, sys')

def clear_subinterp(interpid):
_interpreters.run_string(interpid, textwrap.dedent(f'''
del sys.modules[{name!r}]
_testsinglephase._clear_globals()
_testinternalcapi.clear_extension({name!r}, {filename!r})
'''))

with self.subTest('without resetting; '
'already loaded in main interpreter'):
Expand Down Expand Up @@ -361,6 +372,10 @@ def test_singlephase_multiple_interpreters(self):
initialized = _testsinglephase.state_initialized()
if _initialized != initialized:
raise Exception((_initialized, initialized))
if _initialized != {initialized}:
raise Exception((_initialized, {initialized}))
if initialized != {initialized}:
raise Exception((initialized, {initialized}))

# Attrs set after loading are not in m_copy.
if hasattr(_testsinglephase, 'spam'):
Expand All @@ -381,6 +396,70 @@ def test_singlephase_multiple_interpreters(self):
# However, globals are still shared.
_interpreters.run_string(interp2, script)

_forget_extension(_testsinglephase)
for interpid in [interp1, interp2]:
clear_subinterp(interpid)

with self.subTest('without resetting; '
'already loaded in deleted interpreter'):

# Use an interpreter that gets destroyed right away.
ret = support.run_in_subinterp(textwrap.dedent(f'''
import _testsinglephase

# This is the first time loaded since reset.
init_count = _testsinglephase.initialized_count()
if init_count != 1:
raise Exception(init_count)

# Attrs set in the module init func are in m_copy.
_initialized = _testsinglephase._module_initialized
initialized = _testsinglephase.state_initialized()
if _initialized != initialized:
raise Exception((_initialized, initialized))
if _initialized == {initialized}:
raise Exception((_initialized, {initialized}))
if initialized == {initialized}:
raise Exception((initialized, {initialized}))

# Attrs set after loading are not in m_copy.
if hasattr(_testsinglephase, 'spam'):
raise Exception(_testsinglephase.spam)
_testsinglephase.spam = 'spam, spam, mash, spam, eggs, and spam'
'''))
self.assertEqual(ret, 0)

script = textwrap.dedent(f'''
import _testsinglephase

init_count = _testsinglephase.initialized_count()
if init_count != 2:
raise Exception(init_count)

# Attrs set in the module init func are in m_copy.
# Both of the following were set in module init,
# which didn't happen in this interpreter
# (unfortunately).
_initialized = _testsinglephase._module_initialized
initialized = _testsinglephase.state_initialized()
if _initialized != initialized:
raise Exception((_initialized, initialized))

# Attrs set after loading are not in m_copy.
if hasattr(_testsinglephase, 'spam'):
raise Exception(_testsinglephase.spam)
_testsinglephase.spam = 'spam, spam, spam, spam, ...'
''')

# The module's init func gets run again.
# The module's globals did not get destroyed.
_interpreters.run_string(interp1, script)

# The module's init func is not run again.
# The second interpreter copies the module's m_copy.
# However, globals are still shared.
_interpreters.run_string(interp2, script)

@requires_load_dynamic
def test_singlephase_variants(self):
# Exercise the most meaningful variants described in Python/import.c.
Expand Down