Skip to content

test(okhttp): Wait until the reader is blocked before closing the body #6604

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
romtsn merged 1 commit into from
Nov 13, 2026
Merged

test(okhttp): Wait until the reader is blocked before closing the body #6604

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
10 changes: 7 additions & 3 deletions sentry-okhttp/src/test/java/io/sentry/okhttp/CapturedResponseBodyTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,16 @@ class CapturedResponseBodyTest {
private val closed = CountDownLatch(1)
private var sent = false

/** Counts down once a read is blocked waiting for [close]. */
val parked = CountDownLatch(1)

override fun read(sink: Buffer, byteCount: Long): Long {
if (!sent) {
sent = true
sink.write(chunk)
return chunk.size.toLong()
}
parked.countDown()
closed.await(10, TimeUnit.SECONDS)
return -1L
}
Expand Down Expand Up @@ -260,19 +264,19 @@ class CapturedResponseBodyTest {
val chunk = "data: event-0\n\n".toByteArray()
val source = ParkingSource(chunk)
val (wrapper, captured) = capture(source, 1024)
val chunkRead = CountDownLatch(1)
val readDone = CountDownLatch(1)
val reader = Thread {
val bodySource = wrapper.source()
bodySource.readByteArray(chunk.size.toLong())
chunkRead.countDown()
bodySource.readByteArray()
readDone.countDown()
}
reader.isDaemon = true
reader.start()

assertTrue(chunkRead.await(10, TimeUnit.SECONDS), "the reader must have received the chunk")
// Wait until the reader is blocked inside read(). Closing before that would make the next read
// throw "closed" on the reader thread instead of returning end of stream.
assertTrue(source.parked.await(10, TimeUnit.SECONDS), "the reader must be blocked in read()")
wrapper.close()

assertTrue(
Expand Down
Loading