Fix rest test with ssl_ca_bundle due to conflicts with OS environment#2394
Merged
kevinjqliu merged 3 commits intoapache:mainfrom Aug 28, 2025
Merged
Fix rest test with ssl_ca_bundle due to conflicts with OS environment#2394kevinjqliu merged 3 commits intoapache:mainfrom
kevinjqliu merged 3 commits intoapache:mainfrom
Conversation
kevinjqliu
reviewed
Aug 28, 2025
tests/catalog/test_rest.py
Outdated
Comment on lines
1499
to
1502
| if "REQUESTS_CA_BUNDLE" in os.environ: | ||
| os.environ.pop("REQUESTS_CA_BUNDLE") | ||
| if "CURL_CA_BUNDLE" in os.environ: | ||
| os.environ.pop("CURL_CA_BUNDLE") |
Contributor
There was a problem hiding this comment.
nit:
I think os.environ.pop mutates the env vars. It might be better to use moneypatch.delenv here
WDYT?
Contributor
|
could you run the linter again? :) |
Fokko
approved these changes
Aug 28, 2025
Contributor
Fokko
left a comment
Fokko
left a comment
There was a problem hiding this comment.
LGTM, Thanks for fixing this @manuzhang
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Rationale for this change
Request sessions could load
REQUESTS_CA_BUNDLEorCURL_CA_BUNDLEfrom OS environment such that cabundle passed in from the UT is not used.https://github.com/psf/requests/blob/88dce9d854797c05d0ff296b70e0430535ef8aaf/src/requests/sessions.py#L766-L771
Are these changes tested?
Yes
Are there any user-facing changes?
No