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
script -> snapshot_script.
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Feb 22, 2023
commit c6a39e38d423bf7549d96f382fc776be849adffe
25 changes: 13 additions & 12 deletions Lib/test/test_imp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ def clear_subinterp(interpid):
self.addCleanup(os.close, r)
self.addCleanup(os.close, w)

script = textwrap.dedent(f'''
snapshot_script = textwrap.dedent(f'''
import json
import os

Expand Down Expand Up @@ -455,19 +455,19 @@ def read_data():
_testsinglephase.spam = 'spam, spam, spam, spam, eggs, and spam'

# Use an interpreter that gets destroyed right away.
ret = support.run_in_subinterp(script)
ret = support.run_in_subinterp(snapshot_script)
self.assertEqual(ret, 0)
snap = read_data()
check_common(snap)
check_copied(snap, main_snap)

# Use several interpreters that overlap.
_interpreters.run_string(interp1, script)
_interpreters.run_string(interp1, snapshot_script)
snap = read_data()
check_common(snap)
check_copied(snap, main_snap)

_interpreters.run_string(interp2, script)
_interpreters.run_string(interp2, snapshot_script)
snap = read_data()
check_common(snap)
check_copied(snap, main_snap)
Expand All @@ -481,7 +481,7 @@ def read_data():
'already loaded in deleted interpreter'):
# Use an interpreter that gets destroyed right away.
ret = support.run_in_subinterp(os.linesep.join([
script,
snapshot_script,
textwrap.dedent('''
# Attrs set after loading are not in m_copy.
_testsinglephase.spam = 'spam, spam, mash, spam, eggs, and spam'
Expand All @@ -492,12 +492,12 @@ def read_data():
check_fresh(base)

# Use several interpreters that overlap.
_interpreters.run_string(interp1, script)
_interpreters.run_string(interp1, snapshot_script)
interp1_snap = read_data()
check_common(interp1_snap)
check_semi_fresh(interp1_snap, main_snap, base)

_interpreters.run_string(interp2, script)
_interpreters.run_string(interp2, snapshot_script)
snap = read_data()
check_common(snap)
check_copied(snap, interp1_snap)
Expand All @@ -506,14 +506,15 @@ def read_data():
_testsinglephase._clear_globals()

# Use an interpreter that gets destroyed right away.
ret = support.run_in_subinterp(os.linesep.join([
script = os.linesep.join([
setup_script,
cleanup_script,
script,
snapshot_script,
textwrap.dedent('''
# Attrs set after loading are not in m_copy.
_testsinglephase.spam = 'spam, spam, mash, spam, eggs, and spam'
''')]))
''')])
ret = support.run_in_subinterp(script)
self.assertEqual(ret, 0)
base = read_data()
check_common(base)
Expand All @@ -522,14 +523,14 @@ def read_data():
# Use several interpreters that overlap.
clear_subinterp(interp1)
#_interpreters.run_string(interpid, cleanup_script)
_interpreters.run_string(interp1, script)
_interpreters.run_string(interp1, snapshot_script)
snap = read_data()
check_common(snap)
check_fresh(snap)

clear_subinterp(interp2)
#_interpreters.run_string(interpid, cleanup_script)
_interpreters.run_string(interp2, script)
_interpreters.run_string(interp2, snapshot_script)
snap = read_data()
check_common(snap)
check_fresh(snap)
Expand Down