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

Fix sendfile test fixture #9064

Merged
merged 2 commits into from
Sep 22, 2024
Merged

Fix sendfile test fixture #9064

merged 2 commits into from
Sep 22, 2024

Conversation

Dreamsorcerer
Copy link
Member

Not sure this is the best way to do it, but certainly better than before.

Fixes #8971.

@Dreamsorcerer Dreamsorcerer added bot:chronographer:skip This PR does not need to include a change note backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Sep 8, 2024
Copy link

codecov bot commented Sep 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.30%. Comparing base (11a96fc) to head (7dc471b).
Report is 59 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9064   +/-   ##
=======================================
  Coverage   98.30%   98.30%           
=======================================
  Files         107      107           
  Lines       34371    34371           
  Branches     4072     4072           
=======================================
  Hits        33787    33787           
  Misses        412      412           
  Partials      172      172           
Flag Coverage Δ
CI-GHA 98.21% <100.00%> (+0.01%) ⬆️
OS-Linux 97.87% <100.00%> (+0.01%) ⬆️
OS-Windows 96.26% <100.00%> (ø)
OS-macOS 97.53% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.63% <100.00%> (ø)
Py-3.10.14 97.56% <100.00%> (ø)
Py-3.11.9 97.79% <100.00%> (ø)
Py-3.12.5 97.91% <100.00%> (ø)
Py-3.9.13 97.52% <100.00%> (ø)
Py-3.9.19 97.37% <100.00%> (-0.10%) ⬇️
Py-pypy7.3.16 97.39% <100.00%> (+0.32%) ⬆️
VM-macos 97.53% <100.00%> (-0.01%) ⬇️
VM-ubuntu 97.87% <100.00%> (+0.01%) ⬆️
VM-windows 96.26% <100.00%> (ø)

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.

@bdraco bdraco merged commit 7b11e23 into master Sep 22, 2024
34 of 35 checks passed
@bdraco bdraco deleted the fix-test-fixture branch September 22, 2024 14:55
Copy link
Contributor

patchback bot commented Sep 22, 2024

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

❌ Failed to cleanly apply 7b11e23 on top of patchback/backports/3.10/7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1/pr-9064

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

Copy link
Contributor

patchback bot commented Sep 22, 2024

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

❌ Failed to cleanly apply 7b11e23 on top of patchback/backports/3.11/7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1/pr-9064

Backporting merged PR #9064 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/7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1/pr-9064 upstream/3.11
  4. Now, cherry-pick PR Fix sendfile test fixture #9064 contents into that branch:
    $ git cherry-pick -x 7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1
    If it'll yell at you with something like fatal: Commit 7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix sendfile test fixture #9064 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.11/7b11e234aee86aba2ef24c4e0664dcd0b9fe8cd1/pr-9064
  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 pushed 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>
(cherry picked from commit 7b11e23)
@bdraco
Copy link
Member

bdraco commented Sep 22, 2024

3.10 #9224
3.11 #9225

bdraco pushed 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>
(cherry picked from commit 7b11e23)
bdraco added a commit that referenced this pull request Sep 22, 2024
Co-authored-by: pre-commit-ci[bot]
Co-authored-by: Sam Bull <[email protected]>
bdraco added a commit that referenced this pull request Sep 22, 2024
Co-authored-by: pre-commit-ci[bot]
Co-authored-by: Sam Bull <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-3.10 Trigger automatic backporting to the 3.10 release branch by Patchback robot backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot bot:chronographer:skip This PR does not need to include a change note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

test_web_sendfile_functional isn't testing sendfile
2 participants