Skip to content

Remove mocked coro #10910

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 4 commits into from
May 20, 2025
Merged

Remove mocked coro #10910

merged 4 commits into from
May 20, 2025

Conversation

polkapolka
Copy link
Contributor

@polkapolka polkapolka commented May 20, 2025

What do these changes do?

Removed a function that was redundant to AsyncMock functionality.

Are there changes in behavior for the user?

No.

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

No.

Related issue number

Fixes #9212

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.

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label May 20, 2025
@bdraco bdraco added 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 20, 2025
Copy link

codecov bot commented May 20, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.75%. Comparing base (a4be2cb) to head (ee50d49).
Report is 4 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10910      +/-   ##
==========================================
- Coverage   98.75%   98.75%   -0.01%     
==========================================
  Files         129      129              
  Lines       38938    39072     +134     
  Branches     2164     2164              
==========================================
+ Hits        38454    38586     +132     
- Misses        336      337       +1     
- Partials      148      149       +1     
Flag Coverage Δ
CI-GHA 98.64% <100.00%> (-0.01%) ⬇️
OS-Linux 98.34% <98.57%> (+<0.01%) ⬆️
OS-Windows 96.50% <98.57%> (-0.01%) ⬇️
OS-macOS 97.49% <98.57%> (+<0.01%) ⬆️
Py-3.10.11 97.39% <100.00%> (+<0.01%) ⬆️
Py-3.10.17 97.92% <98.57%> (+<0.01%) ⬆️
Py-3.11.12 97.96% <98.57%> (-0.04%) ⬇️
Py-3.11.9 97.46% <100.00%> (+<0.01%) ⬆️
Py-3.12.10 98.41% <100.00%> (-0.01%) ⬇️
Py-3.13.3 98.40% <100.00%> (+<0.01%) ⬆️
Py-3.9.13 97.26% <100.00%> (+<0.01%) ⬆️
Py-3.9.22 97.78% <98.57%> (+<0.01%) ⬆️
Py-pypy7.3.16 93.09% <98.57%> (+3.90%) ⬆️
VM-macos 97.49% <98.57%> (+<0.01%) ⬆️
VM-ubuntu 98.34% <98.57%> (+<0.01%) ⬆️
VM-windows 96.50% <98.57%> (-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 20, 2025

CodSpeed Performance Report

Merging #10910 will degrade performances by 8.64%

Comparing polkapolka:remove-mocked-coro (ee50d49) with master (b25eca0)

Summary

❌ 1 (👁 1) regressions
✅ 59 untouched benchmarks

Benchmarks breakdown

Benchmark BASE HEAD Change
👁 test_ten_streamed_responses_iter_any[pyloop] 21.6 ms 23.6 ms -8.64%

@bdraco bdraco merged commit 36a2567 into aio-libs:master May 20, 2025
41 of 43 checks passed
Copy link
Contributor

patchback bot commented May 20, 2025

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

❌ Failed to cleanly apply 36a2567 on top of patchback/backports/3.11/36a2567d96903007a2b6ff6c10af9392767bfe0f/pr-10910

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

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

❌ Failed to cleanly apply 36a2567 on top of patchback/backports/3.12/36a2567d96903007a2b6ff6c10af9392767bfe0f/pr-10910

Backporting merged PR #10910 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/36a2567d96903007a2b6ff6c10af9392767bfe0f/pr-10910 upstream/3.12
  4. Now, cherry-pick PR Remove mocked coro #10910 contents into that branch:
    $ git cherry-pick -x 36a2567d96903007a2b6ff6c10af9392767bfe0f
    If it'll yell at you with something like fatal: Commit 36a2567d96903007a2b6ff6c10af9392767bfe0f is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 36a2567d96903007a2b6ff6c10af9392767bfe0f
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove mocked coro #10910 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/36a2567d96903007a2b6ff6c10af9392767bfe0f/pr-10910
  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 pushed a commit that referenced this pull request May 20, 2025
(cherry picked from commit 36a2567)
Comment on lines 1143 to +1144
trace = mock.Mock()
trace.send_response_chunk_received = make_mocked_coro()
trace.send_response_chunk_received = mock.AsyncMock()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally most of these should be replaced with create_autospec(), if anyone is willing to do a bit more on these and help make the code more robust.

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:provided There is a change note present in this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove make_mocked_coro()
3 participants