https://github.com/python/cpython/commit/c99f7667436d8978b4077704333e2a351f2a026f
commit: c99f7667436d8978b4077704333e2a351f2a026f
branch: main
author: Bénédikt Tran <[email protected]>
committer: picnixz <[email protected]>
date: 2026-01-04T21:44:47+01:00
summary:
gh-143309: fix `test_execve_env_concurrent_mutation_with_fspath_posix` buildbot
failure (#143415)
files:
M Lib/test/test_os/test_os.py
diff --git a/Lib/test/test_os/test_os.py b/Lib/test/test_os/test_os.py
index 67ab945101149d..82c55c8ba33065 100644
--- a/Lib/test/test_os/test_os.py
+++ b/Lib/test/test_os/test_os.py
@@ -2627,6 +2627,8 @@ def test_execve_invalid_env(self):
# See https://github.com/python/cpython/issues/137934 and the other
# related issues for the reason why we cannot test this on Windows.
@unittest.skipIf(os.name == "nt", "POSIX-specific test")
+ @unittest.skipUnless(unix_shell and os.path.exists(unix_shell),
+ "requires a shell")
def test_execve_env_concurrent_mutation_with_fspath_posix(self):
# Prevent crash when mutating environment during parsing.
# Regression test for https://github.com/python/cpython/issues/143309.
@@ -2648,14 +2650,17 @@ def __len__(self): return 1
def keys(self): return KEYS
def values(self): return VALUES
- args = [sys.executable, '-c', "print({message!r})"]
+ args = [{unix_shell!r}, '-c', 'echo \"{message!s}\"']
os.execve(args[0], args, MyEnv())
- """.format(message=message)
+ """.format(unix_shell=unix_shell, message=message)
- # Use '__cleanenv' to signal to assert_python_ok() not
- # to do a copy of os.environ on its own.
- rc, out, _ = assert_python_ok('-c', code, __cleanenv=True)
- self.assertEqual(rc, 0)
+ # Make sure to forward "LD_*" variables so that assert_python_ok()
+ # can run correctly.
+ minimal = {k: v for k, v in os.environ.items() if k.startswith("LD_")}
+ with os_helper.EnvironmentVarGuard() as env:
+ env.clear()
+ env.update(minimal)
+ _, out, _ = assert_python_ok('-c', code, **env)
self.assertIn(bytes(message, "ascii"), out)
@unittest.skipUnless(sys.platform == "win32", "Win32-specific test")
_______________________________________________
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]
