Skip to content

fix(tests): skip aiohttp stub patches that fixed VCR.py doesn't need #834

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
Abhijeet Prasad (AbhiPrasad) merged 1 commit into from
Oct 2, 2026
Merged

fix(tests): skip aiohttp stub patches that fixed VCR.py doesn't need #834

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
17 changes: 13 additions & 4 deletions py/src/braintrust/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ def _patch_vcr_aiohttp_stubs():
is empty. Fix: after reading the body for recording, reset the response's
content stream so it can be read again by the caller.

VCR.py releases with kevin1024/vcrpy#1055 fix 1, 3 and 4 themselves, so the
patches for those (including gzip decoding of the content stream) only apply
to older releases. Delete them once uv.lock has such a release.

See: https://github.com/kevin1024/vcrpy/issues/927
"""
try:
Expand Down Expand Up @@ -110,8 +114,6 @@ def patched_response_init(self, method, url, request_info=None):

aiohttp_stubs.MockClientResponse.__init__ = patched_response_init

aiohttp_stubs.MockStream.set_exception = lambda self, exc: None

if not hasattr(aiohttp_stubs.MockStream, "iter_chunked"):
# Older aiohttp exposed iter_chunked via AsyncStreamReaderMixin. Since
# that mixin is gone, VCR.py's MockStream needs the method directly for
Expand All @@ -134,18 +136,25 @@ async def patched_read(self):
return _decompress_body(self._body)

aiohttp_stubs.MockClientResponse.read = patched_read
aiohttp_stubs.MockClientResponse._bt_patched = True

if issubclass(aiohttp_stubs.MockStream, streams.StreamReader):
# VCR.py with kevin1024/vcrpy#1055 (MockStream is then aiohttp's StreamReader)
# fixes 1, 3 and 4 itself, and MockStream() without the body raises there.
return

aiohttp_stubs.MockStream.set_exception = lambda self, exc: None

@property
def cached_content(self):
if not hasattr(self, "_cached_content"):
stream = aiohttp_stubs.MockStream()
stream = aiohttp_stubs.MockStream() # pylint: disable=no-value-for-parameter
stream.feed_data(_decompress_body(self._body))
stream.feed_eof()
self._cached_content = stream
return self._cached_content

aiohttp_stubs.MockClientResponse.content = cached_content
aiohttp_stubs.MockClientResponse._bt_patched = True

# Patch record_response to not consume the response body. VCR's original
# implementation calls `await response.read()` which exhausts the body,
Expand Down
Loading