Fix pytest.warns(None) usage, deprecated in pytest 7 #6664

bnavigator · 2022-03-28T19:42:16Z

What do these changes do?

Fix a deprecated misuse of pytest.warns()

https://docs.pytest.org/en/latest/deprecations.html#using-pytest-warns-none

Since the test suire errors on any unfiltered warning anyway, these context manageres are not necessary.

Are there changes in behavior for the user?

No. Just the test suite

Related issue number

#6663

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."

Deprecated misuse of pytest.warns() https://docs.pytest.org/en/latest/deprecations.html#using-pytest-warns-none

test_session_close_awaitable() does the exact same thing and should throw a deprecation warning already which is caught by the general filter

codecov · 2022-03-28T22:00:38Z

Codecov Report

Merging #6664 (ee07b6b) into master (f5ff95e) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #6664      +/-   ##
==========================================
- Coverage   93.36%   93.36%   -0.01%     
==========================================
  Files         104      104              
  Lines       30637    30628       -9     
  Branches     3080     3077       -3     
==========================================
- Hits        28605    28596       -9     
  Misses       1859     1859              
  Partials      173      173

Flag	Coverage Δ
unit	`93.28% <100.00%> (-0.01%)`	⬇️

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

Impacted Files	Coverage Δ
tests/test_client_functional.py	`98.20% <100.00%> (-0.01%)`	⬇️

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 f5ff95e...ee07b6b. Read the comment docs.

patchback · 2022-03-28T22:24:53Z

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

❌ Failed to cleanly apply 936e682 on top of patchback/backports/3.8/936e682d1ab6c833b3e5f0cc3596882cb9cb2444/pr-6664

Backporting merged PR #6664 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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/936e682d1ab6c833b3e5f0cc3596882cb9cb2444/pr-6664 upstream/3.8

Now, cherry-pick PR Fix pytest.warns(None) usage, deprecated in pytest 7 #6664 contents into that branch:
```
$ git cherry-pick -x 936e682d1ab6c833b3e5f0cc3596882cb9cb2444
```
If it'll yell at you with something like fatal: Commit 936e682d1ab6c833b3e5f0cc3596882cb9cb2444 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 936e682d1ab6c833b3e5f0cc3596882cb9cb2444
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix pytest.warns(None) usage, deprecated in pytest 7 #6664 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.8/936e682d1ab6c833b3e5f0cc3596882cb9cb2444/pr-6664

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.

patchback · 2022-03-28T22:24:58Z

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

❌ Failed to cleanly apply 936e682 on top of patchback/backports/3.9/936e682d1ab6c833b3e5f0cc3596882cb9cb2444/pr-6664

Backporting merged PR #6664 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
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
```

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.9/936e682d1ab6c833b3e5f0cc3596882cb9cb2444/pr-6664 upstream/3.9

Now, cherry-pick PR Fix pytest.warns(None) usage, deprecated in pytest 7 #6664 contents into that branch:
```
$ git cherry-pick -x 936e682d1ab6c833b3e5f0cc3596882cb9cb2444
```
If it'll yell at you with something like fatal: Commit 936e682d1ab6c833b3e5f0cc3596882cb9cb2444 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 936e682d1ab6c833b3e5f0cc3596882cb9cb2444
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Fix pytest.warns(None) usage, deprecated in pytest 7 #6664 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.9/936e682d1ab6c833b3e5f0cc3596882cb9cb2444/pr-6664

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.

* remove pytest.warns(None) Deprecated misuse of pytest.warns() https://docs.pytest.org/en/latest/deprecations.html#using-pytest-warns-none * Remove duplicate test test_session_close_awaitable() does the exact same thing and should throw a deprecation warning already which is caught by the general filter * PR 6664 metadata * "Fix" spelling. Bots everywhere! * Update 6663.bugfix * Update 6663.bugfix Co-authored-by: Sam Bull <[email protected]> (cherry picked from commit 936e682)

webknjaz · 2022-09-04T21:01:04Z

Backported as 0ac32a1 (3.9) and 54e18cd (3.8).

bnavigator added 2 commits March 28, 2022 21:31

remove pytest.warns(None)

a19801b

Deprecated misuse of pytest.warns() https://docs.pytest.org/en/latest/deprecations.html#using-pytest-warns-none

Remove duplicate test

b52b2ad

test_session_close_awaitable() does the exact same thing and should throw a deprecation warning already which is caught by the general filter

bnavigator requested a review from asvetlov as a code owner March 28, 2022 19:42

PR 6664 metadata

e9e5646

bnavigator requested a review from webknjaz as a code owner March 28, 2022 19:44

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Mar 28, 2022

bnavigator changed the title ~~Fix pytest7~~ Fix pytest.warns(None) usage, deprecated in pytest 7 Mar 28, 2022

bnavigator and others added 2 commits March 28, 2022 22:51

"Fix" spelling. Bots everywhere!

6e92a69

Update 6663.bugfix

d4ac1ea

Dreamsorcerer added backport-3.8 labels Mar 28, 2022

Update 6663.bugfix

ee07b6b

Dreamsorcerer merged commit 936e682 into aio-libs:master Mar 28, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix pytest.warns(None) usage, deprecated in pytest 7 #6664

Fix pytest.warns(None) usage, deprecated in pytest 7 #6664

bnavigator commented Mar 28, 2022 •

edited

Loading

codecov bot commented Mar 28, 2022 •

edited

Loading

patchback bot commented Mar 28, 2022 •

edited

Loading

patchback bot commented Mar 28, 2022 •

edited

Loading

webknjaz commented Sep 4, 2022

Fix pytest.warns(None) usage, deprecated in pytest 7 #6664

Fix pytest.warns(None) usage, deprecated in pytest 7 #6664

Conversation

bnavigator commented Mar 28, 2022 • edited Loading

What do these changes do?

Are there changes in behavior for the user?

Related issue number

Checklist

codecov bot commented Mar 28, 2022 • edited Loading

Codecov Report

patchback bot commented Mar 28, 2022 • edited Loading

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

Backporting merged PR #6664 into master

patchback bot commented Mar 28, 2022 • edited Loading

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

Backporting merged PR #6664 into master

webknjaz commented Sep 4, 2022

bnavigator commented Mar 28, 2022 •

edited

Loading

codecov bot commented Mar 28, 2022 •

edited

Loading

patchback bot commented Mar 28, 2022 •

edited

Loading

patchback bot commented Mar 28, 2022 •

edited

Loading