https://github.com/python/cpython/commit/fafb3275f25e116e51ff0b867aec597cb3de840f
commit: fafb3275f25e116e51ff0b867aec597cb3de840f
branch: main
author: AN Long <a...@users.noreply.github.com>
committer: gpshead <g...@krypto.org>
date: 2024-01-10T15:17:05-08:00
summary:
gh-87868: Skip `test_one_environment_variable` in `test_subprocess` when the
platform or build cannot do that (#113867)
* improve the assert for test_one_environment_variable
* skip some test in test_subprocess when python is configured with shared
* also skip the test if AddressSanitizer is enabled
---------
Co-authored-by: Steve Dower <steve.do...@microsoft.com>
files:
M Lib/test/test_subprocess.py
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 102e697ba7a90d..944a7de4210bc9 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -835,6 +835,11 @@ def is_env_var_to_ignore(n):
if not is_env_var_to_ignore(k)]
self.assertEqual(child_env_names, [])
+ @unittest.skipIf(sysconfig.get_config_var('Py_ENABLE_SHARED') == 1,
+ 'The Python shared library cannot be loaded '
+ 'without some system environments.')
+ @unittest.skipIf(check_sanitizer(address=True),
+ 'AddressSanitizer adds to the environment.')
def test_one_environment_variable(self):
newenv = {'fruit': 'orange'}
cmd = [sys.executable, '-c',
@@ -842,9 +847,13 @@ def test_one_environment_variable(self):
'sys.stdout.write("fruit="+os.getenv("fruit"))']
if sys.platform == "win32":
cmd = ["CMD", "/c", "SET", "fruit"]
- with subprocess.Popen(cmd, stdout=subprocess.PIPE, env=newenv) as p:
- stdout, _ = p.communicate()
- self.assertTrue(stdout.startswith(b"fruit=orange"))
+ with subprocess.Popen(cmd, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=newenv) as p:
+ stdout, stderr = p.communicate()
+ if p.returncode and support.verbose:
+ print("STDOUT:", stdout.decode("ascii", "replace"))
+ print("STDERR:", stderr.decode("ascii", "replace"))
+ self.assertEqual(p.returncode, 0)
+ self.assertEqual(stdout.strip(), b"fruit=orange")
def test_invalid_cmd(self):
# null character in the command name
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
