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

Reduce indent in connector tests #9371

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Reduce indent in connector tests #9371

merged 1 commit into from
Oct 1, 2024

Conversation

bdraco
Copy link
Member

@bdraco bdraco commented Oct 1, 2024

What do these changes do?

Small cleanup ahead of #7368 since we will need to copy this pattern

Small cleanup ahead of #7368
@bdraco bdraco requested a review from asvetlov as a code owner October 1, 2024 15:14
@bdraco bdraco 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 Oct 1, 2024
Copy link

codecov bot commented Oct 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.56%. Comparing base (e3b1011) to head (d3c0aa1).
Report is 3 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #9371      +/-   ##
==========================================
- Coverage   98.56%   98.56%   -0.01%     
==========================================
  Files         107      107              
  Lines       34981    34977       -4     
  Branches     4149     4145       -4     
==========================================
- Hits        34478    34474       -4     
  Misses        335      335              
  Partials      168      168              
Flag Coverage Δ
CI-GHA 98.44% <100.00%> (-0.01%) ⬇️
OS-Linux 98.10% <100.00%> (-0.01%) ⬇️
OS-Windows 96.51% <100.00%> (-0.01%) ⬇️
OS-macOS 97.79% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.66% <100.00%> (-0.01%) ⬇️
Py-3.10.15 97.60% <100.00%> (-0.01%) ⬇️
Py-3.11.10 97.66% <100.00%> (-0.01%) ⬇️
Py-3.11.9 97.74% <100.00%> (-0.01%) ⬇️
Py-3.12.6 98.15% <100.00%> (-0.01%) ⬇️
Py-3.13.0-rc.2 98.14% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.56% <100.00%> (-0.01%) ⬇️
Py-3.9.20 97.50% <100.00%> (-0.01%) ⬇️
Py-pypy7.3.16 97.11% <100.00%> (-0.01%) ⬇️
VM-macos 97.79% <100.00%> (-0.01%) ⬇️
VM-ubuntu 98.10% <100.00%> (-0.01%) ⬇️
VM-windows 96.51% <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.

@bdraco bdraco enabled auto-merge (squash) October 1, 2024 15:39
@bdraco bdraco merged commit c25099c into master Oct 1, 2024
38 of 39 checks passed
@bdraco bdraco deleted the cleanup branch October 1, 2024 15:40
Copy link
Contributor

patchback bot commented Oct 1, 2024

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

❌ Failed to cleanly apply c25099c on top of patchback/backports/3.10/c25099cebff5daddfc6f7668f765fce720540041/pr-9371

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

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

❌ Failed to cleanly apply c25099c on top of patchback/backports/3.11/c25099cebff5daddfc6f7668f765fce720540041/pr-9371

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

1 participant