Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

[3.13] gh-119584: Fix test_import Failed Assertion (gh-119623) (gh-119633) 

The fix in gh-119561 introduced an assertion that doesn't hold true if any of the three new test extension modules are loaded more than once.  This is fine normally but breaks if the new test_check_state_first() is run more than once, which happens for refleak checking and with the regrtest --forever flag.  We fix that here by clearing each of the three modules after loading them.  We also tweak a check in _modules_by_index_check().

(cherry picked from commit ae7b17673f)

Co-authored-by: Eric Snow <ericsnowcurrently@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-05-27 22:04:13 +02:00 committed by GitHub
parent bd9983cab8
commit 660125f864
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/test/test_import/__init__.py
View File

@ -2887,12 +2887,15 @@ class SinglephaseInitTests(unittest.TestCase):
self.assertIs(reloaded.snapshot.cached, reloaded.module) self.assertIs(reloaded.snapshot.cached, reloaded.module)
@unittest.skipIf(_testinternalcapi is None, "requires _testinternalcapi")
def test_check_state_first(self): def test_check_state_first(self):
for variant in ['', '_with_reinit', '_with_state']: for variant in ['', '_with_reinit', '_with_state']:
name = f'{self.NAME}{variant}_check_cache_first' name = f'{self.NAME}{variant}_check_cache_first'
with self.subTest(name): with self.subTest(name):
mod = self._load_dynamic(name, self.ORIGIN) mod = self._load_dynamic(name, self.ORIGIN)
self.assertEqual(mod.__name__, name) self.assertEqual(mod.__name__, name)
sys.modules.pop(name, None)
_testinternalcapi.clear_extension(name, self.ORIGIN)
# Currently, for every single-phrase init module loaded # Currently, for every single-phrase init module loaded
# in multiple interpreters, those interpreters share a # in multiple interpreters, those interpreters share a

3
Modules/_testsinglephase.c
View File

@ -682,6 +682,9 @@ finally:
/* the _testsinglephase_*_check_cache_first modules */ /* the _testsinglephase_*_check_cache_first modules */
/****************************************************/ /****************************************************/
/* Each of these modules should only be freshly loaded. That means
clearing the caches and each module def's m_base after each load. */
static struct PyModuleDef _testsinglephase_check_cache_first = { static struct PyModuleDef _testsinglephase_check_cache_first = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
.m_name = "_testsinglephase_check_cache_first", .m_name = "_testsinglephase_check_cache_first",

4
Python/import.c
View File

@ -494,7 +494,7 @@ _modules_by_index_check(PyInterpreterState *interp, Py_ssize_t index)
if (MODULES_BY_INDEX(interp) == NULL) { if (MODULES_BY_INDEX(interp) == NULL) {
return "Interpreters module-list not accessible."; return "Interpreters module-list not accessible.";
} }
if (index > PyList_GET_SIZE(MODULES_BY_INDEX(interp))) { if (index >= PyList_GET_SIZE(MODULES_BY_INDEX(interp))) {
return "Module index out of bounds."; return "Module index out of bounds.";
} }
return NULL; return NULL;
@ -2183,7 +2183,7 @@ clear_singlephase_extension(PyInterpreterState *interp,
/* Clear data set when the module was initially loaded. */ /* Clear data set when the module was initially loaded. */
def->m_base.m_init = NULL; def->m_base.m_init = NULL;
Py_CLEAR(def->m_base.m_copy); Py_CLEAR(def->m_base.m_copy);
// We leave m_index alone since there's no reason to reset it. def->m_base.m_index = 0;
/* Clear the PyState_*Module() cache entry. */ /* Clear the PyState_*Module() cache entry. */
Py_ssize_t index = _get_cached_module_index(cached); Py_ssize_t index = _get_cached_module_index(cached);