https://github.com/python/cpython/commit/5dc79e3d7f26a6a871a89ce3efc9f1bcee7bb447
commit: 5dc79e3d7f26a6a871a89ce3efc9f1bcee7bb447
branch: main
author: Itamar Oren <[email protected]>
committer: carljm <[email protected]>
date: 2024-01-02T17:30:53-07:00
summary:
gh-113628: Fix test_site test with long stdlib paths (#113640)
files:
M Lib/test/test_site.py
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 33d0975bda8eaa..9f199d9069d207 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -641,10 +641,24 @@ def _calc_sys_path_for_underpth_nosite(self, sys_prefix,
lines):
sys_path.append(abs_path)
return sys_path
+ def _get_pth_lines(self, libpath: str, *, import_site: bool):
+ pth_lines = ['fake-path-name']
+ # include 200 lines of `libpath` in _pth lines (or fewer
+ # if the `libpath` is long enough to get close to 32KB
+ # see https://github.com/python/cpython/issues/113628)
+ encoded_libpath_length = len(libpath.encode("utf-8"))
+ repetitions = min(200, 30000 // encoded_libpath_length)
+ if repetitions <= 2:
+ self.skipTest(
+ f"Python stdlib path is too long ({encoded_libpath_length:,}
bytes)")
+ pth_lines.extend(libpath for _ in range(repetitions))
+ pth_lines.extend(['', '# comment'])
+ if import_site:
+ pth_lines.append('import site')
+ return pth_lines
+
@support.requires_subprocess()
def test_underpth_basic(self):
- libpath = test.support.STDLIB_DIR
- exe_prefix = os.path.dirname(sys.executable)
pth_lines = ['#.', '# ..', *sys.path, '.', '..']
exe_file = self._create_underpth_exe(pth_lines)
sys_path = self._calc_sys_path_for_underpth_nosite(
@@ -666,12 +680,7 @@ def test_underpth_basic(self):
def test_underpth_nosite_file(self):
libpath = test.support.STDLIB_DIR
exe_prefix = os.path.dirname(sys.executable)
- pth_lines = [
- 'fake-path-name',
- *[libpath for _ in range(200)],
- '',
- '# comment',
- ]
+ pth_lines = self._get_pth_lines(libpath, import_site=False)
exe_file = self._create_underpth_exe(pth_lines)
sys_path = self._calc_sys_path_for_underpth_nosite(
os.path.dirname(exe_file),
@@ -695,13 +704,8 @@ def test_underpth_nosite_file(self):
def test_underpth_file(self):
libpath = test.support.STDLIB_DIR
exe_prefix = os.path.dirname(sys.executable)
- exe_file = self._create_underpth_exe([
- 'fake-path-name',
- *[libpath for _ in range(200)],
- '',
- '# comment',
- 'import site'
- ])
+ exe_file = self._create_underpth_exe(
+ self._get_pth_lines(libpath, import_site=True))
sys_prefix = os.path.dirname(exe_file)
env = os.environ.copy()
env['PYTHONPATH'] = 'from-env'
@@ -720,13 +724,8 @@ def test_underpth_file(self):
def test_underpth_dll_file(self):
libpath = test.support.STDLIB_DIR
exe_prefix = os.path.dirname(sys.executable)
- exe_file = self._create_underpth_exe([
- 'fake-path-name',
- *[libpath for _ in range(200)],
- '',
- '# comment',
- 'import site'
- ], exe_pth=False)
+ exe_file = self._create_underpth_exe(
+ self._get_pth_lines(libpath, import_site=True), exe_pth=False)
sys_prefix = os.path.dirname(exe_file)
env = os.environ.copy()
env['PYTHONPATH'] = 'from-env'
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
