Skip to content

Add host parameter to aiohttp_server fixture (#10120)#10121

Merged
Dreamsorcerer merged 3 commits intoaio-libs:masterfrom
christianwbrock:cwb/aiohttp_server_host_parameter
Dec 9, 2024
Merged

Add host parameter to aiohttp_server fixture (#10120)#10121
Dreamsorcerer merged 3 commits intoaio-libs:masterfrom
christianwbrock:cwb/aiohttp_server_host_parameter

Conversation

@christianwbrock
Copy link
Copy Markdown
Contributor

@christianwbrock christianwbrock commented Dec 5, 2024

Fixes #10120

It adds a host parameter to the aiohttp_server fixture to allow access
from non local clients, e.g. running in docker containers.

@codspeed-hq
Copy link
Copy Markdown

codspeed-hq bot commented Dec 5, 2024

CodSpeed Performance Report

Merging #10121 will not alter performance

Comparing christianwbrock:cwb/aiohttp_server_host_parameter (a00b2cb) with master (6200513)

Summary

✅ 47 untouched benchmarks

@codecov
Copy link
Copy Markdown

codecov bot commented Dec 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.75%. Comparing base (703ce61) to head (a00b2cb).
Report is 333 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #10121      +/-   ##
==========================================
- Coverage   98.76%   98.75%   -0.01%     
==========================================
  Files         122      122              
  Lines       36958    36954       -4     
  Branches     4408     4411       +3     
==========================================
- Hits        36500    36494       -6     
- Misses        311      313       +2     
  Partials      147      147              
Flag Coverage Δ
CI-GHA 98.64% <100.00%> (-0.01%) ⬇️
OS-Linux 98.33% <100.00%> (-0.01%) ⬇️
OS-Windows 96.17% <100.00%> (-0.01%) ⬇️
OS-macOS 97.44% <100.00%> (+<0.01%) ⬆️
Py-3.10.11 97.27% <100.00%> (-0.01%) ⬇️
Py-3.10.15 97.86% <100.00%> (+0.04%) ⬆️
Py-3.11.10 97.90% <100.00%> (+0.04%) ⬆️
Py-3.11.9 97.32% <100.00%> (-0.02%) ⬇️
Py-3.12.7 98.38% <100.00%> (-0.01%) ⬇️
Py-3.13.0 97.19% <100.00%> (-0.01%) ⬇️
Py-3.13.1 98.34% <100.00%> (-0.01%) ⬇️
Py-3.9.13 97.20% <100.00%> (+<0.01%) ⬆️
Py-3.9.20 97.73% <100.00%> (-0.05%) ⬇️
Py-pypy7.3.16 97.34% <100.00%> (-0.01%) ⬇️
VM-macos 97.44% <100.00%> (+<0.01%) ⬆️
VM-ubuntu 98.33% <100.00%> (-0.01%) ⬇️
VM-windows 96.17% <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.

ChristianWBrock and others added 3 commits December 5, 2024 21:44
@psf-chronographer psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Dec 9, 2024
@Dreamsorcerer Dreamsorcerer merged commit 7f8e2d3 into aio-libs:master Dec 9, 2024
@patchback
Copy link
Copy Markdown
Contributor

patchback bot commented Dec 9, 2024

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

❌ Failed to cleanly apply 7f8e2d3 on top of patchback/backports/3.12/7f8e2d35ad4d0d5fed82721060bafd1bafa264b8/pr-10121

Backporting merged PR #10121 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/7f8e2d35ad4d0d5fed82721060bafd1bafa264b8/pr-10121 upstream/3.12
  4. Now, cherry-pick PR Add host parameter to aiohttp_server fixture (#10120) #10121 contents into that branch:
    $ git cherry-pick -x 7f8e2d35ad4d0d5fed82721060bafd1bafa264b8
    If it'll yell at you with something like fatal: Commit 7f8e2d35ad4d0d5fed82721060bafd1bafa264b8 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 7f8e2d35ad4d0d5fed82721060bafd1bafa264b8
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Add host parameter to aiohttp_server fixture (#10120) #10121 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.12/7f8e2d35ad4d0d5fed82721060bafd1bafa264b8/pr-10121
  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 pushed a commit that referenced this pull request Dec 9, 2024
Co-authored-by: ChristianWBrock <christian.brock AT posteo.net>
(cherry picked from commit 7f8e2d3)
Dreamsorcerer added a commit that referenced this pull request Dec 9, 2024
Co-authored-by: ChristianWBrock <christian.brock AT posteo.net>
(cherry picked from commit 7f8e2d3)

Co-authored-by: christianwbrock <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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.

Add host parameter to aiohttp_server fixture.

2 participants