gh-87868: Sort and remove duplicates in getenvironment() #102731

aisk · 2023-03-15T15:59:11Z

This should fix #87868 .

Issue: [_winapi] correctly sort and remove duplicates in getenvironment() #87868

Misc/NEWS.d/next/Windows/2023-03-15-23-53-45.gh-issue-87868.4C36oQ.rst

Modules/_winapi.c

@ericsnowcurrently

The "check if generated files are up to date" CI check appears to be currently failing on all PRs (but not on pushes to main) See, for example: - python#94468 - python#94468 - python#102731 This appears to be because the C-analyzer tool doesn't like the `#line` directives introduced in python@70185de. I'm advised by the message printed to the terminal in https://github.com/python/cpython/actions/runs/4428706945/jobs/7768216988#step:14:84 that this is the appropriate short-term fix! Cc. @ericsnowcurrently

The "check if generated files are up to date" CI check appears to be currently failing on all PRs (but not on pushes to main) See, for example: - #94468 - #94468 - #102731 This appears to be because the C-analyzer tool doesn't like the `#line` directives introduced in 70185de. I'm advised by the message printed to the terminal in https://github.com/python/cpython/actions/runs/4428706945/jobs/7768216988#step:14:84 that this is the appropriate short-term fix!

The "check if generated files are up to date" CI check appears to be currently failing on all PRs (but not on pushes to main) See, for example: - python#94468 - python#94468 - python#102731 This appears to be because the C-analyzer tool doesn't like the `#line` directives introduced in python@70185de. I'm advised by the message printed to the terminal in https://github.com/python/cpython/actions/runs/4428706945/jobs/7768216988#step:14:84 that this is the appropriate short-term fix!

Modules/_winapi.c

Lib/test/test_subprocess.py

Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com>

Modules/_winapi.c

Lib/test/test_subprocess.py

Modules/_winapi.c

zooba · 2024-01-09T15:58:41Z

CI looks good (and Azure Pipelines can be ignored here), so congrats! It's in!

…nGH-102731) (cherry picked from commit c31be58) Co-authored-by: AN Long <aisk@users.noreply.github.com> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com> Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>

bedevere-app · 2024-01-09T15:59:27Z

GH-113865 is a backport of this pull request to the 3.12 branch.

…nGH-102731) (cherry picked from commit c31be58) Co-authored-by: AN Long <aisk@users.noreply.github.com> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com> Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>

bedevere-app · 2024-01-09T15:59:32Z

GH-113866 is a backport of this pull request to the 3.11 branch.

bedevere-bot · 2024-01-09T16:05:18Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 RHEL7 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/15/builds/6594) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/15/builds/6594

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL7-x86_64/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

bedevere-bot · 2024-01-09T16:08:41Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 RHEL8 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/185/builds/5849) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/185/builds/5849

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-x86_64/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

bedevere-bot · 2024-01-09T16:12:37Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot aarch64 RHEL8 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/529/builds/5692) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/529/builds/5692

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-aarch64/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

zooba · 2024-01-09T16:15:29Z

Okay, these buildbot failures look related to the new test. Will be a couple hours before I can dig into it myself, so if someone else gets started first, I'd add the actual stdout to the message parameter of the assertTrue call to see what's happening there.

It's possible that the process is failing to start with a mostly empty environment?

aisk · 2024-01-09T16:17:36Z

I'm attempting to address it, I think maybe it's caused by create a new process need some basic environment to start with.

bedevere-bot · 2024-01-09T16:26:43Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot aarch64 Fedora Stable 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/125/builds/5079) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/125/builds/5079

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-aarch64/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

bedevere-bot · 2024-01-09T16:29:47Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 RHEL8 FIPS Only Blake2 Builtin Hash 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/469/builds/6966) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/469/builds/6966

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-RHEL8-fips-x86_64.no-builtin-hashes-except-blake2/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

bedevere-bot · 2024-01-09T16:33:38Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 Ubuntu Shared 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/506/builds/6791) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/506/builds/6791

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/srv/buildbot/buildarea/3.x.bolen-ubuntu/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

aisk · 2024-01-09T16:37:58Z

Change the assertTrue to assertEqual will help to address it. Should I open a new PR to do this, or is there some other way to do it?

aisk · 2024-01-09T16:43:11Z

The change will be like #113867

bedevere-bot · 2024-01-09T16:53:34Z

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 Fedora Stable 3.x has failed when building commit c31be58.

What do you need to do:

Don't panic.
Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/543/builds/5159) and take a look at the build logs.
Check if the failure is related to this commit (c31be58) or if it is a false positive.
If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/543/builds/5159

Failed tests:

test_subprocess

Failed subtests:

test_one_environment_variable - test.test_subprocess.ProcessTestCase.test_one_environment_variable
test_one_environment_variable - test.test_subprocess.ProcessTestCaseNoPoll.test_one_environment_variable

Summary of the results of the build (if available):

==

Click to see traceback logs

Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.x.cstratak-fedora-stable-x86_64/build/Lib/test/test_subprocess.py", line 847, in test_one_environment_variable
    self.assertTrue(stdout.startswith(b"fruit=orange"))
    ~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
AssertionError: False is not true

(cherry picked from commit c31be58) Co-authored-by: AN Long <aisk@users.noreply.github.com> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com> Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>

pythongh-87868: correctly sort and remove duplicates in getenvironment()

aed39b7

aisk requested a review from gpshead as a code owner March 15, 2023 15:59

bedevere-bot mentioned this pull request Mar 15, 2023

[_winapi] correctly sort and remove duplicates in getenvironment() #87868

Closed

bedevere-bot added the awaiting review label Mar 15, 2023

eendebakpt reviewed Mar 15, 2023

View reviewed changes

Misc/NEWS.d/next/Windows/2023-03-15-23-53-45.gh-issue-87868.4C36oQ.rst Outdated Show resolved Hide resolved

Modules/_winapi.c Outdated Show resolved Hide resolved

This was referenced Mar 15, 2023

Exclude ceval.c from the C-analyzer tool #102735

Merged

C-analyzer tool cannot parse #line directives #102737

Closed

Merge branch 'main' into getenvironment

4de761b

aisk force-pushed the getenvironment branch from 5837143 to 0182d07 Compare March 17, 2023 15:39

check null in normalize_environment

04f7d59

aisk force-pushed the getenvironment branch from 0182d07 to 04f7d59 Compare March 17, 2023 15:57

aisk requested a review from eendebakpt April 3, 2023 12:10

eendebakpt reviewed Aug 19, 2023

View reviewed changes

Modules/_winapi.c Outdated Show resolved Hide resolved

Modules/_winapi.c Outdated Show resolved Hide resolved

Lib/test/test_subprocess.py Show resolved Hide resolved

aisk and others added 6 commits August 20, 2023 16:17

Update Modules/_winapi.c

c43abb2

Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com>

Update Modules/_winapi.c

3f6319a

Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com>

Update Lib/test/test_subprocess.py

8ef3b9c

Co-authored-by: Pieter Eendebak <pieter.eendebak@gmail.com>

Merge remote-tracking branch 'upstream/main' into getenvironment

46491c5

Adapt latest changes from main branch

ca13205

Fix test case

f727004

aisk requested a review from eendebakpt August 20, 2023 12:41

eendebakpt reviewed Aug 22, 2023

View reviewed changes

aisk added 2 commits September 3, 2023 17:26

update for review comments

6b9e873

add win32 related env validation tests

dd53528

aisk requested a review from eendebakpt September 3, 2023 11:32

eendebakpt reviewed Sep 3, 2023

View reviewed changes

Modules/_winapi.c Outdated Show resolved Hide resolved

fix memory leak

37fa2f2

zooba approved these changes Jan 9, 2024

View reviewed changes

zooba merged commit c31be58 into python:main Jan 9, 2024
31 of 32 checks passed

bedevere-app bot removed the awaiting merge label Jan 9, 2024

zooba added OS-windows needs backport to 3.11 bug and security fixes needs backport to 3.12 bug and security fixes labels Jan 9, 2024

This comment has been minimized.

Sign in to view

bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Jan 9, 2024

bedevere-app bot removed the needs backport to 3.11 bug and security fixes label Jan 9, 2024

aisk deleted the getenvironment branch January 9, 2024 16:35

aisk mentioned this pull request Jan 9, 2024

gh-87868: Skip some test in test_subprocess if python is configured with --enable-shared #113867

Merged

gh-87868: Sort and remove duplicates in getenvironment() #102731

gh-87868: Sort and remove duplicates in getenvironment() #102731

aisk commented Mar 15, 2023 •

edited by bedevere-bot

zooba commented Jan 9, 2024

This comment has been minimized.

This comment has been minimized.

bedevere-app bot commented Jan 9, 2024

bedevere-app bot commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

zooba commented Jan 9, 2024

aisk commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

aisk commented Jan 9, 2024

aisk commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

gh-87868: Sort and remove duplicates in getenvironment() #102731

gh-87868: Sort and remove duplicates in getenvironment() #102731

Conversation

aisk commented Mar 15, 2023 • edited by bedevere-bot

zooba commented Jan 9, 2024

This comment has been minimized.

This comment has been minimized.

bedevere-app bot commented Jan 9, 2024

bedevere-app bot commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

zooba commented Jan 9, 2024

aisk commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

aisk commented Jan 9, 2024

aisk commented Jan 9, 2024

bedevere-bot commented Jan 9, 2024

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

aisk commented Mar 15, 2023 •

edited by bedevere-bot