Skip to content
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.

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

Add Generic for TestClient.app #8977

Merged
merged 8 commits into from
Sep 22, 2024
Merged

Add Generic for TestClient.app #8977

merged 8 commits into from
Sep 22, 2024

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Sep 1, 2024

This should avoid annoying assert client.app is not None lines in test code.

Fixes #7226.

@Dreamsorcerer Dreamsorcerer added the backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot label Sep 1, 2024
CHANGES/8977.bugfix.rst Outdated Show resolved Hide resolved
aiohttp/pytest_plugin.py Dismissed Show dismissed Hide dismissed
aiohttp/pytest_plugin.py Dismissed Show dismissed Hide dismissed
aiohttp/pytest_plugin.py Dismissed Show dismissed Hide dismissed
aiohttp/pytest_plugin.py Dismissed Show dismissed Hide dismissed
aiohttp/test_utils.py Dismissed Show dismissed Hide dismissed
aiohttp/test_utils.py Dismissed Show dismissed Hide dismissed
Copy link

codecov bot commented Sep 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.42%. Comparing base (63813fe) to head (c3ed458).
Report is 1051 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8977   +/-   ##
=======================================
  Coverage   98.42%   98.42%           
=======================================
  Files         107      107           
  Lines       34681    34707   +26     
  Branches     4110     4114    +4     
=======================================
+ Hits        34134    34160   +26     
  Misses        380      380           
  Partials      167      167           
Flag Coverage Δ
CI-GHA 98.30% <84.21%> (-0.01%) ⬇️
OS-Linux 97.97% <84.21%> (-0.01%) ⬇️
OS-Windows 96.36% <84.21%> (-0.01%) ⬇️
OS-macOS 97.65% <84.21%> (-0.01%) ⬇️
Py-3.10.11 97.74% <68.42%> (-0.02%) ⬇️
Py-3.10.15 97.67% <68.42%> (-0.02%) ⬇️
Py-3.11.10 97.57% <84.21%> (-0.01%) ⬇️
Py-3.11.9 97.64% <84.21%> (-0.01%) ⬇️
Py-3.12.6 98.02% <84.21%> (-0.01%) ⬇️
Py-3.9.13 97.62% <68.42%> (-0.02%) ⬇️
Py-3.9.20 97.56% <68.42%> (-0.02%) ⬇️
Py-pypy7.3.16 97.18% <68.42%> (-0.02%) ⬇️
VM-macos 97.65% <84.21%> (-0.01%) ⬇️
VM-ubuntu 97.97% <84.21%> (-0.01%) ⬇️
VM-windows 96.36% <84.21%> (-0.01%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 22, 2024
@bdraco bdraco enabled auto-merge (squash) September 22, 2024 16:21
@bdraco bdraco merged commit 6db2c74 into master Sep 22, 2024
33 of 34 checks passed
@bdraco bdraco deleted the test-client-app-type branch September 22, 2024 19:38
Copy link
Contributor

patchback bot commented Sep 22, 2024

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

❌ Failed to cleanly apply 6db2c74 on top of patchback/backports/3.11/6db2c747572b3e77a2d64e3f6c5a01ecae74fcff/pr-8977

Backporting merged PR #8977 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.11/6db2c747572b3e77a2d64e3f6c5a01ecae74fcff/pr-8977 upstream/3.11
  4. Now, cherry-pick PR Add Generic for TestClient.app #8977 contents into that branch:
    $ git cherry-pick -x 6db2c747572b3e77a2d64e3f6c5a01ecae74fcff
    If it'll yell at you with something like fatal: Commit 6db2c747572b3e77a2d64e3f6c5a01ecae74fcff is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 6db2c747572b3e77a2d64e3f6c5a01ecae74fcff
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add Generic for TestClient.app #8977 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/6db2c747572b3e77a2d64e3f6c5a01ecae74fcff/pr-8977
  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.

@bdraco
Copy link
Member

bdraco commented Sep 22, 2024

There are a lot of conflicts in the backport as I wasn't 100% sure on all of them.

Dreamsorcerer added a commit that referenced this pull request Sep 22, 2024
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit 6db2c74)
@Dreamsorcerer
Copy link
Member Author

#9245

Dreamsorcerer added a commit that referenced this pull request Sep 22, 2024
Co-authored-by: J. Nick Koston <[email protected]>
(cherry picked from commit 6db2c74)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TestClient.app can be None
2 participants