Skip to content

[PR #11546/92dee75 backport][3.13] Refactor websocket frame compression tests in test_websocket_writer #11556

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.

Sign up for GitHub

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 1 commit into from
Oct 4, 2025
Merged

[PR #11546/92dee75 backport][3.13] Refactor websocket frame compression tests in test_websocket_writer #11556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions CHANGES/11546.contrib.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed ``test_send_compress_text`` failing when alternative zlib implementation
is used. (``zlib-ng`` in python 3.14 windows build) -- by :user:`Cycloctane`.
33 changes: 29 additions & 4 deletions tests/test_websocket_writer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from aiohttp import WSMsgType
from aiohttp._websocket.reader import WebSocketDataQueue
from aiohttp.compression_utils import ZLibBackend
from aiohttp.http import WebSocketReader, WebSocketWriter


Expand Down Expand Up @@ -83,20 +84,44 @@ async def test_send_text_masked(protocol, transport) -> None:
writer.transport.write.assert_called_with(b"\x81\x84\rg\xb3fy\x02\xcb\x12") # type: ignore[attr-defined]


@pytest.mark.usefixtures("parametrize_zlib_backend")
async def test_send_compress_text(protocol, transport) -> None:
compress_obj = ZLibBackend.compressobj(level=ZLibBackend.Z_BEST_SPEED, wbits=-15)
writer = WebSocketWriter(protocol, transport, compress=15)

msg = (
compress_obj.compress(b"text") + compress_obj.flush(ZLibBackend.Z_SYNC_FLUSH)
).removesuffix(b"\x00\x00\xff\xff")
await writer.send_frame(b"text", WSMsgType.TEXT)
writer.transport.write.assert_called_with(b"\xc1\x06*I\xad(\x01\x00") # type: ignore[attr-defined]
writer.transport.write.assert_called_with( # type: ignore[attr-defined]
b"\xc1" + len(msg).to_bytes(1, "big") + msg
)

msg = (
compress_obj.compress(b"text") + compress_obj.flush(ZLibBackend.Z_SYNC_FLUSH)
).removesuffix(b"\x00\x00\xff\xff")
await writer.send_frame(b"text", WSMsgType.TEXT)
writer.transport.write.assert_called_with(b"\xc1\x05*\x01b\x00\x00") # type: ignore[attr-defined]
writer.transport.write.assert_called_with( # type: ignore[attr-defined]
b"\xc1" + len(msg).to_bytes(1, "big") + msg
)


@pytest.mark.usefixtures("parametrize_zlib_backend")
async def test_send_compress_text_notakeover(protocol, transport) -> None:
compress_obj = ZLibBackend.compressobj(level=ZLibBackend.Z_BEST_SPEED, wbits=-15)
writer = WebSocketWriter(protocol, transport, compress=15, notakeover=True)

msg = (
compress_obj.compress(b"text") + compress_obj.flush(ZLibBackend.Z_FULL_FLUSH)
).removesuffix(b"\x00\x00\xff\xff")
await writer.send_frame(b"text", WSMsgType.TEXT)
writer.transport.write.assert_called_with(b"\xc1\x06*I\xad(\x01\x00") # type: ignore[attr-defined]
writer.transport.write.assert_called_with( # type: ignore[attr-defined]
b"\xc1" + len(msg).to_bytes(1, "big") + msg
)
await writer.send_frame(b"text", WSMsgType.TEXT)
writer.transport.write.assert_called_with(b"\xc1\x06*I\xad(\x01\x00") # type: ignore[attr-defined]
writer.transport.write.assert_called_with( # type: ignore[attr-defined]
b"\xc1" + len(msg).to_bytes(1, "big") + msg
)


async def test_send_compress_text_per_message(protocol, transport) -> None:
Expand Down
Loading