test_proxy_from_env did not clear proxies already set in the

[scirelli]

What do these changes do?

Fix failing tests when a environment proxy is set.

test_proxy_from_env did not clear proxies already set in the environment. Added code to first clear proxies that were already set.

Refactored the parametrize input on test_proxy_from_env to work more like test_get_env_proxy_for_url to be consistent.

Are there changes in behavior for the user?

No.

Related issue number

#5554

Checklist

• I think the code is well written
• Unit tests for the changes exist
• Documentation reflects the changes
• If you provide code modification, please add yourself to CONTRIBUTORS.txt
  • The format is <Name> <Surname>.
  • Please keep alphabetical order, the file is sorted by names.
• Add a new news fragment into the CHANGES folder
  • name it <issue_id>.<type> for example (588.bugfix)
  • if you don't have an issue_id change it to the pr id after creating the pr
  • ensure type is one of the following:
    • .feature: Signifying a new feature.
    • .bugfix: Signifying a bug fix.
    • .doc: Signifying a documentation improvement.
    • .removal: Signifying a deprecation or removal of public API.
    • .misc: A ticket has been closed, but it is not of interest to users.
  • Make sure to use full sentences with correct case and punctuation, for example: "Fix issue with non-ascii contents in doctest text files."

[codecov]

Codecov Report

Merging #5557 (964a427) into master (1a4126a) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #5557   +/-   ##
=======================================
  Coverage   97.21%   97.21%           
=======================================
  Files          41       41           
  Lines        8863     8863           
  Branches     1425     1425           
=======================================
  Hits         8616     8616           
  Misses        130      130           
  Partials      117      117           

Flag	Coverage Δ
unit	97.10% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1a4126a...964a427. Read the comment docs.

[asvetlov]

LGTM

[patchback]

Backport to 3.8: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply bb4ee18 on top of patchback/backports/3.8/bb4ee18d69eacfcd8333497b0c7b2a108f09e546/pr-5557

Backporting merged PR #5557 into master

1. Ensure you have a local repo clone of your fork. Unless you cloned it
   from the upstream, this would be your origin remote.
2. Make sure you have an upstream repo added as a remote too. In these
   instructions you'll refer to it by the name upstream. If you don't
   have it, here's how you can add it:

   $ git remote add upstream https://github.com/aio-libs/aiohttp.git

3. Ensure you have the latest copy of upstream and prepare a branch
   that will hold the backported code:

   $ git fetch upstream
   $ git checkout -b patchback/backports/3.8/bb4ee18d69eacfcd8333497b0c7b2a108f09e546/pr-5557 upstream/3.8

4. Now, cherry-pick PR test_proxy_from_env did not clear proxies already set in the #5557 contents into that branch:

   $ git cherry-pick -x bb4ee18d69eacfcd8333497b0c7b2a108f09e546

   If it'll yell at you with something like fatal: Commit bb4ee18d69eacfcd8333497b0c7b2a108f09e546 is a merge but no -m option was given., add -m 1 as follows intead:

   $ git cherry-pick -m1 -x bb4ee18d69eacfcd8333497b0c7b2a108f09e546

5. At this point, you'll probably encounter some merge conflicts. You must
   resolve them in to preserve the patch from PR test_proxy_from_env did not clear proxies already set in the #5557 as close to the
   original as possible.
6. Push this branch to your fork on GitHub:

   $ git push origin patchback/backports/3.8/bb4ee18d69eacfcd8333497b0c7b2a108f09e546/pr-5557

7. Create a PR, ensure that the CI is green. If it's not — update it so that
   the tests and any other checks pass. This is it!
   Now relax and wait for the maintainers to process your pull request
   when they have some cycles to do reviews. Don't worry — they'll tell you if
   any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

[aio-libs-github-bot]

💔 Backport was not successful

The PR was attempted backported to the following branches:

• ❌ 3.8: Commit could not be cherrypicked due to conflicts

[asvetlov]

As you can see, backporting is not easy.
I think we can live with it; the PR is about stable tests run in a non-classic environment.

[webknjaz]

Backport PR: #6184