Skip to content

[3.11] gh-87868: Sort and remove duplicates in getenvironment() (GH-102731) #113866

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
zooba merged 6 commits into from
Jan 11, 2024
Merged

[3.11] gh-87868: Sort and remove duplicates in getenvironment() (GH-102731) #113866

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
255872a
gh-87868: Sort and remove duplicates in getenvironment() (GH-102731)
aisk Jan 9, 2024
03022e4
gh-87868: Skip `test_one_environment_variable` in `test_subprocess` w…
aisk Jan 10, 2024
97438d6
Update _winapi.c
zooba Jan 11, 2024
3e66498
Update _winapi.c
zooba Jan 11, 2024
3f85fa9
Update _winapi.c
zooba Jan 11, 2024
15a3a52
Fix sortenvironmentkey
zooba Jan 11, 2024
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
gh-87868: Skip test_one_environment_variable in test_subprocess w… 
…hen 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.dower@microsoft.com>
  • Loading branch information
@aisk @zooba @gpshead
2 people authored and gpshead committed Jan 10, 2024
commit 03022e41d1a214067cca5e383ee80c6dc05ede10
15 changes: 12 additions & 3 deletions Lib/test/test_subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,16 +833,25 @@ 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',
'import sys,os;'
'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
Expand Down