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 flaky tests with unclosed warnings #8391

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Conversation

Dreamsorcerer
Copy link
Member

No description provided.

@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 labels Apr 29, 2024
@Dreamsorcerer Dreamsorcerer changed the title Fix flaky test with unclosed warnings Fix flaky tests with unclosed warnings Apr 29, 2024
tests/test_proxy_functional.py Fixed Show fixed Hide fixed
tests/test_proxy_functional.py Fixed Show fixed Hide fixed
Copy link

codecov bot commented Apr 29, 2024

Codecov Report

Attention: Patch coverage is 38.46154% with 16 lines in your changes are missing coverage. Please review.

Project coverage is 97.64%. Comparing base (04b1212) to head (0a964f5).

Files Patch % Lines
tests/test_proxy_functional.py 38.46% 16 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #8391      +/-   ##
==========================================
+ Coverage   97.62%   97.64%   +0.01%     
==========================================
  Files         107      107              
  Lines       33066    33057       -9     
  Branches     3873     3883      +10     
==========================================
- Hits        32282    32279       -3     
+ Misses        567      561       -6     
  Partials      217      217              
Flag Coverage Δ
CI-GHA 97.56% <38.46%> (+0.01%) ⬆️
OS-Linux 97.22% <38.46%> (+0.01%) ⬆️
OS-Windows 95.64% <38.46%> (+0.01%) ⬆️
OS-macOS 96.88% <38.46%> (+0.01%) ⬆️
Py-3.10.11 97.03% <11.53%> (+<0.01%) ⬆️
Py-3.10.14 96.99% <11.53%> (+<0.01%) ⬆️
Py-3.11.9 97.21% <23.07%> (+<0.01%) ⬆️
Py-3.12.3 97.34% <23.07%> (+<0.01%) ⬆️
Py-3.8.10 95.41% <19.23%> (+0.01%) ⬆️
Py-3.8.18 96.87% <19.23%> (+0.01%) ⬆️
Py-3.9.13 97.01% <26.92%> (+0.01%) ⬆️
Py-3.9.19 96.97% <26.92%> (+0.02%) ⬆️
Py-pypy7.3.15 96.54% <26.92%> (+0.02%) ⬆️
VM-macos 96.88% <38.46%> (+0.01%) ⬆️
VM-ubuntu 97.22% <38.46%> (+0.01%) ⬆️
VM-windows 95.64% <38.46%> (+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.

@Dreamsorcerer Dreamsorcerer merged commit 0ba6cf2 into master Apr 29, 2024
36 of 38 checks passed
@Dreamsorcerer Dreamsorcerer deleted the Dreamsorcerer-patch-4 branch April 29, 2024 20:58
Copy link
Contributor

patchback bot commented Apr 29, 2024

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

❌ Failed to cleanly apply 0ba6cf2 on top of patchback/backports/3.10/0ba6cf26fa99c056e9b98a1f972a91b416850006/pr-8391

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

None yet

1 participant