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

Add xfail test for #9336 #9418

Merged
merged 2 commits into from
Oct 6, 2024

Conversation

Cycloctane
Copy link
Contributor

What do these changes do?

Add a failing test for #9336

Are there changes in behavior for the user?

Is it a substantial burden for the maintainers to support this?

Related issue number

Test for #9336

Checklist

  • I think the code is well written
  • Unit tests for the changes exist
  • Documentation reflects the changes
  • If you provide code modification, please add yourself to CONTRIBUTORS.txt
    • The format is <Name> <Surname>.
    • Please keep alphabetical order, the file is sorted by names.
  • Add a new news fragment into the CHANGES/ folder
    • name it <issue_or_pr_num>.<type>.rst (e.g. 588.bugfix.rst)

    • if you don't have an issue number, change it to the pull request
      number after creating the PR

      • .bugfix: A bug fix for something the maintainers deemed an
        improper undesired behavior that got corrected to match
        pre-agreed expectations.
      • .feature: A new behavior, public APIs. That sort of stuff.
      • .deprecation: A declaration of future API removals and breaking
        changes in behavior.
      • .breaking: When something public is removed in a breaking way.
        Could be deprecated in an earlier release.
      • .doc: Notable updates to the documentation structure or build
        process.
      • .packaging: Notes for downstreams about unobvious side effects
        and tooling. Changes in the test invocation considerations and
        runtime assumptions.
      • .contrib: Stuff that affects the contributor experience. e.g.
        Running tests, building the docs, setting up the development
        environment.
      • .misc: Changes that are hard to assign to any of the above
        categories.
    • Make sure to use full sentences with correct case and punctuation,
      for example:

      Fixed issue with non-ascii contents in doctest text files
      -- by :user:`contributor-gh-handle`.

      Use the past tense or the present tense a non-imperative mood,
      referring to what's changed compared to the last released version
      of this project.

Copy link

codecov bot commented Oct 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.57%. Comparing base (24b0e6f) to head (aecd744).
Report is 50 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #9418   +/-   ##
=======================================
  Coverage   98.57%   98.57%           
=======================================
  Files         107      107           
  Lines       35048    35061   +13     
  Branches     4150     4152    +2     
=======================================
+ Hits        34547    34560   +13     
  Misses        334      334           
  Partials      167      167           
Flag Coverage Δ
CI-GHA 98.45% <100.00%> (+<0.01%) ⬆️
OS-Linux 98.11% <100.00%> (+<0.01%) ⬆️
OS-Windows 96.53% <100.00%> (+<0.01%) ⬆️
OS-macOS 97.80% <100.00%> (-0.01%) ⬇️
Py-3.10.11 97.67% <100.00%> (+<0.01%) ⬆️
Py-3.10.15 97.60% <100.00%> (+<0.01%) ⬆️
Py-3.11.10 97.68% <100.00%> (+<0.01%) ⬆️
Py-3.11.9 97.74% <100.00%> (-0.01%) ⬇️
Py-3.12.6 98.16% <100.00%> (+<0.01%) ⬆️
Py-3.13.0-rc.3 98.15% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.57% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.50% <100.00%> (+<0.01%) ⬆️
Py-pypy7.3.16 97.12% <100.00%> (+<0.01%) ⬆️
VM-macos 97.80% <100.00%> (-0.01%) ⬇️
VM-ubuntu 98.11% <100.00%> (+<0.01%) ⬆️
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.

@Dreamsorcerer Dreamsorcerer added 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 labels Oct 6, 2024
@Dreamsorcerer Dreamsorcerer merged commit dfa1b7e into aio-libs:master Oct 6, 2024
40 of 42 checks passed
Copy link
Contributor

patchback bot commented Oct 6, 2024

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

❌ Failed to cleanly apply dfa1b7e on top of patchback/backports/3.10/dfa1b7e167955b5c190f86ebf55ebe7c09d60697/pr-9418

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

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

❌ Failed to cleanly apply dfa1b7e on top of patchback/backports/3.11/dfa1b7e167955b5c190f86ebf55ebe7c09d60697/pr-9418

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

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.

2 participants