这是indexloc提供的服务，不要输入任何密码
Skip to content

Separate SSLError from HTTPError #11564

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

Jump to bottom
Merged
merged 4 commits into from
Jul 25, 2022
Merged

Separate SSLError from HTTPError #11564

merged 4 commits into from
Jul 25, 2022

Conversation

@kenodegard
Copy link
Contributor

@kenodegard kenodegard commented Jun 21, 2022 •
edited
Loading

Description

Previously SSLErrors were grouped with HTTPErrors and hence became more difficult to diagnose since we'd receive a non-obvious HTTP 000 error. This defines a new CondaSSLErrors and passes through the SSLError for further diagnosis.

See #11367 (not a complete solution as HTTP 000 is still possible).

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jun 21, 2022
@travishathaway travishathaway added the source::anaconda created by members of Anaconda, Inc. label Jun 27, 2022
@kenodegard kenodegard added the in-progress issue is actively being worked on label Jun 28, 2022
@kenodegard kenodegard force-pushed the ssl-errors branch 2 times, most recently from 3615b67 to 704212e Compare June 28, 2022 22:14
@kenodegard kenodegard self-assigned this Jun 29, 2022
@kenodegard kenodegard force-pushed the ssl-errors branch 3 times, most recently from 6d8956c to efbffe1 Compare July 6, 2022 03:44
@kenodegard kenodegard marked this pull request as ready for review July 6, 2022 03:47
@kenodegard kenodegard requested a review from a team as a code owner July 6, 2022 03:47
@kenodegard kenodegard mentioned this pull request Jul 7, 2022
Open
24 tasks
@kenodegard kenodegard force-pushed the ssl-errors branch 2 times, most recently from bf6dc8e to cf862d6 Compare July 17, 2022 17:40
jezdez
jezdez requested changes Jul 18, 2022
View reviewed changes
Copy link
Member

@jezdez jezdez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This increases the number of our test runs drastically just for one test. Can you think of another way that would successfully monkeypatch this, so the tests are run in place and we don't have as much test matrix sprawl?

@kenodegard
Copy link
Contributor Author

kenodegard commented Jul 20, 2022 •
edited
Loading

@jezdez I agree, I dislike that I had to implement the tests this way, but I don't see a simple alternative. Trying to properly mock the import as part of the regular unit test suite is not straightforward. The problem is that conda gets imported as part of pytest startup (https://github.com/conda/conda/blob/6ed9db722e95234b618e5ec36825c3673ffbf302/tests/__init__.py) so even if the no SSL test is the very first test run, conda has already been imported making any mocking very convoluted.

Edit: @travishathaway suggested mocking the request.Session.get instead, great idea, making this nice and clean again.

dholth
dholth reviewed Jul 22, 2022
View reviewed changes
@jezdez jezdez merged commit cf1e7ee into conda:main Jul 25, 2022
@kenodegard kenodegard deleted the ssl-errors branch July 25, 2022 14:28
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Jul 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@dholth dholth dholth left review comments

@jezdez jezdez jezdez approved these changes

Assignees

@kenodegard kenodegard

Labels

cla-signed [bot] added once the contributor has signed the CLA in-progress issue is actively being worked on locked [bot] locked due to inactivity source::anaconda created by members of Anaconda, Inc.

Projects

No open projects
🧭 Planning
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@kenodegard @jezdez @dholth @travishathaway @conda-bot