Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions conformance/test/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -543,18 +543,17 @@ async def serve_granian(

async def serve_gunicorn(
request: ServerCompatRequest,
mode: Mode,
certfile: str | None,
keyfile: str | None,
cafile: str | None,
port_future: asyncio.Future[int],
):
args = [
"--bind=127.0.0.1:0",
"--workers=4",
"--worker-class=gthread",
"--threads=16",
"--keep-alive=0",
]
args = ["--bind=127.0.0.1:0", "--workers=4"]
if mode == "sync":
args.extend(["--worker-class=gthread", "--threads=16", "--keep-alive=0"])
else:
args.append("--worker-class=asgi")
if certfile:
args.append(f"--certfile={certfile}")
if keyfile:
Expand All @@ -563,7 +562,7 @@ async def serve_gunicorn(
args.append(f"--ca-certs={cafile}")
args.append(f"--cert-reqs={ssl.CERT_REQUIRED}")

args.append("server:wsgi_app")
args.append("server:wsgi_app" if mode == "sync" else "server:asgi_app")

proc = await asyncio.create_subprocess_exec(
"gunicorn",
Expand Down Expand Up @@ -791,11 +790,10 @@ async def main() -> None:
)
)
case "gunicorn":
if args.mode == "async":
msg = "gunicorn does not support async mode"
raise ValueError(msg)
serve_task = asyncio.create_task(
serve_gunicorn(request, certfile, keyfile, cafile, port_future)
serve_gunicorn(
request, args.mode, certfile, keyfile, cafile, port_future
)
)
case "hypercorn":
serve_task = asyncio.create_task(
Expand Down
20 changes: 19 additions & 1 deletion conformance/test/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def test_server_sync(server: str, cov: Coverage) -> None:
pytest.fail(f"\n{result.stdout}\n{result.stderr}")


@pytest.mark.parametrize("server", ["daphne", "pyvoy", "uvicorn"])
@pytest.mark.parametrize("server", ["daphne", "gunicorn", "pyvoy", "uvicorn"])
def test_server_async(server: str, cov: Coverage) -> None:
args = maybe_patch_args_with_debug(
[sys.executable, _server_py_path, "--mode", "async", "--server", server]
Expand All @@ -104,6 +104,24 @@ def test_server_async(server: str, cov: Coverage) -> None:
"--skip",
"gRPC Unexpected Requests/**",
]
case "gunicorn":
opts = [
# gunicorn's native HTTP/2 ASGI worker sends GOAWAY after very few streams
# under load; no upstream issue filed yet (see PR #3568 for related h2 fix)
"--skip",
"**/HTTPVersion:2/**",
"--skip",
"**/HTTPVersion:3/**",
# gunicorn's gunicorn_h1c C parser returns 400 "Invalid request line" for
# gRPC-Web requests broadly; no upstream issue filed yet
# (see issue #3563 for a related gunicorn_h1c strictness regression)
"--skip",
"**/Protocol:PROTOCOL_GRPC_WEB/**",
"--skip",
"gRPC-Web Proto Sub-Format Requests/**",
"--skip",
"gRPC-Web Unexpected Requests/**",
]
case "uvicorn":
# uvicorn doesn't support HTTP/2 or 3
opts = ["--skip", "**/HTTPVersion:2/**", "--skip", "**/HTTPVersion:3/**"]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ dev = [
"daphne==4.2.1",
"granian==2.7.3",
"grpcio-tools==1.80.0",
"gunicorn==25.3.0",
"gunicorn[http2]==25.3.0",
"hypercorn==0.18.0",
"poethepoet==0.44.0",
"pyright[nodejs]==1.1.408",
Expand Down
15 changes: 10 additions & 5 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading