Skip to content

Commit

Permalink
Bump websockets to 11.0.3.
Browse files Browse the repository at this point in the history
Fix #1927.

Change ws_handler to wait for the transport to be closed before exiting.
This prevents a performance optimization in websockets to cause a test
failure. Also, it aligns the behavior between wsproto and websockets.
  • Loading branch information
aaugustin committed Jul 30, 2023
1 parent 8239373 commit 24fa3d0
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ h11 @ git+https://github.com/python-hyper/h11.git@master
# Explicit optionals
a2wsgi==1.7.0
wsproto==1.2.0
websockets==10.4
websockets==11.0.3

# Packaging
build==0.10.0
Expand Down
2 changes: 1 addition & 1 deletion tests/protocols/test_websocket.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ async def test_asgi_return_value(
unused_tcp_port: int,
):
"""
The ASGI callable should return 'None'. If it doesn't make sure that
The ASGI callable should return 'None'. If it doesn't, make sure that
the connection is closed with an error condition.
"""

Expand Down
2 changes: 1 addition & 1 deletion uvicorn/protocols/websockets/websockets_impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ async def ws_handler( # type: ignore[override]
'send' and 'receive' events to drive the flow.
"""
self.handshake_completed_event.set()
await self.closed_event.wait()
await self.wait_closed()

async def run_asgi(self) -> None:
"""
Expand Down

0 comments on commit 24fa3d0

Please sign in to comment.