Skip to content

Fix flakey client functional keep alive tests #10933

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

Merged
merged 1 commit into from
May 22, 2025
Merged

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented May 22, 2025

SSIA

@bdraco bdraco requested a review from asvetlov as a code owner May 22, 2025 15:41
@bdraco bdraco added bot:chronographer:skip This PR does not need to include a change note backport-3.11 Trigger automatic backporting to the 3.11 release branch by Patchback robot backport-3.12 Trigger automatic backporting to the 3.12 release branch by Patchback robot labels May 22, 2025
Copy link

codecov bot commented May 22, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.77%. Comparing base (545783b) to head (67c94e1).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10933      +/-   ##
==========================================
+ Coverage   98.74%   98.77%   +0.03%     
==========================================
  Files         129      129              
  Lines       39455    39455              
  Branches     2184     2184              
==========================================
+ Hits        38958    38970      +12     
+ Misses        346      337       -9     
+ Partials      151      148       -3     
Flag Coverage Δ
CI-GHA 98.65% <100.00%> (+0.02%) ⬆️
OS-Linux 98.36% <100.00%> (+0.02%) ⬆️
OS-Windows 96.53% <100.00%> (+0.01%) ⬆️
OS-macOS 97.51% <100.00%> (+0.05%) ⬆️
Py-3.10.11 97.41% <100.00%> (ø)
Py-3.10.17 97.94% <100.00%> (+0.18%) ⬆️
Py-3.11.12 98.02% <60.00%> (+0.63%) ⬆️
Py-3.11.9 97.48% <60.00%> (+1.26%) ⬆️
Py-3.12.10 98.42% <100.00%> (+0.82%) ⬆️
Py-3.13.3 98.42% <100.00%> (+0.46%) ⬆️
Py-3.9.13 97.28% <100.00%> (+1.27%) ⬆️
Py-3.9.22 97.81% <100.00%> (+0.18%) ⬆️
Py-pypy7.3.16 84.52% <100.00%> (?)
VM-macos 97.51% <100.00%> (+0.05%) ⬆️
VM-ubuntu 98.36% <100.00%> (+0.02%) ⬆️
VM-windows 96.53% <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.

Copy link

codspeed-hq bot commented May 22, 2025

CodSpeed Performance Report

Merging #10933 will not alter performance

Comparing flakey_keep_alive_tests (67c94e1) with master (545783b)

Summary

✅ 59 untouched benchmarks

@bdraco bdraco merged commit 597161d into master May 22, 2025
43 checks passed
@bdraco bdraco deleted the flakey_keep_alive_tests branch May 22, 2025 15:53
Copy link
Contributor

patchback bot commented May 22, 2025

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

❌ Failed to cleanly apply 597161d on top of patchback/backports/3.11/597161d1127d04e7842642d7548d4bd8de3115a6/pr-10933

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

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

❌ Failed to cleanly apply 597161d on top of patchback/backports/3.12/597161d1127d04e7842642d7548d4bd8de3115a6/pr-10933

Backporting merged PR #10933 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.12/597161d1127d04e7842642d7548d4bd8de3115a6/pr-10933 upstream/3.12
  4. Now, cherry-pick PR Fix flakey client functional keep alive tests #10933 contents into that branch:
    $ git cherry-pick -x 597161d1127d04e7842642d7548d4bd8de3115a6
    If it'll yell at you with something like fatal: Commit 597161d1127d04e7842642d7548d4bd8de3115a6 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 597161d1127d04e7842642d7548d4bd8de3115a6
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Fix flakey client functional keep alive tests #10933 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/597161d1127d04e7842642d7548d4bd8de3115a6/pr-10933
  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 added a commit that referenced this pull request May 22, 2025
bdraco added a commit that referenced this pull request May 22, 2025
bdraco added a commit that referenced this pull request May 22, 2025
bdraco added a commit that referenced this pull request May 22, 2025
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 backport-3.12 Trigger automatic backporting to the 3.12 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.

1 participant