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

Avoid logging exception from run_app() that is also raised #8951

Merged
merged 4 commits into from
Sep 1, 2024

Conversation

Dreamsorcerer
Copy link
Member

@Dreamsorcerer Dreamsorcerer commented Aug 30, 2024

Fixes #6807.

@Dreamsorcerer Dreamsorcerer added backport-3.10 backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot labels Aug 30, 2024
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Aug 30, 2024
Copy link

codecov bot commented Aug 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.27%. Comparing base (cc6d763) to head (77a8c13).
Report is 1072 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #8951   +/-   ##
=======================================
  Coverage   98.27%   98.27%           
=======================================
  Files         107      107           
  Lines       34226    34239   +13     
  Branches     4058     4061    +3     
=======================================
+ Hits        33637    33650   +13     
  Misses        416      416           
  Partials      173      173           
Flag Coverage Δ
CI-GHA 98.17% <100.00%> (+<0.01%) ⬆️
OS-Linux 97.83% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.24% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.51% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.60% <100.00%> (+<0.01%) ⬆️
Py-3.10.14 97.54% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.77% <100.00%> (+<0.01%) ⬆️
Py-3.12.5 97.88% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.49% <100.00%> (+<0.01%) ⬆️
Py-3.9.19 97.43% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.04% <100.00%> (+<0.01%) ⬆️
VM-macos 97.51% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 97.83% <100.00%> (+<0.01%) ⬆️
VM-windows 96.24% <100.00%> (+<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.

tests/test_run_app.py Outdated Show resolved Hide resolved
aiohttp/web.py Show resolved Hide resolved
@Dreamsorcerer Dreamsorcerer merged commit 45d6e4f into master Sep 1, 2024
34 of 35 checks passed
@Dreamsorcerer Dreamsorcerer deleted the avoid-exc-log-run-app branch September 1, 2024 19:31
Copy link
Contributor

patchback bot commented Sep 1, 2024

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

❌ Failed to cleanly apply 45d6e4f on top of patchback/backports/3.10/45d6e4f14572bfc4cfc3f32a2c7c72a9cc28f125/pr-8951

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

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

❌ Failed to cleanly apply 45d6e4f on top of patchback/backports/3.11/45d6e4f14572bfc4cfc3f32a2c7c72a9cc28f125/pr-8951

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

Dreamsorcerer added a commit that referenced this pull request Sep 1, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 1, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 1, 2024
Dreamsorcerer added a commit that referenced this pull request Sep 1, 2024
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.

Error Message shown on handled exception
2 participants