Skip to content

Fix flaky preferCallConnectionOverDeferredConnection test #9539

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

Open
kamilkrzywanski wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix flaky preferCallConnectionOverDeferredConnection test #9539

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
25 changes: 16 additions & 9 deletions okhttp/src/jvmTest/kotlin/okhttp3/FastFallbackTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ import java.io.IOException
import java.net.Inet4Address
import java.net.Inet6Address
import java.net.InetAddress
import java.net.InetSocketAddress
import java.net.Socket
import java.net.SocketAddress
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
import javax.net.SocketFactory
Expand Down Expand Up @@ -280,18 +282,23 @@ class FastFallbackTest {
serverIpv4.protocols = listOf(Protocol.H2_PRIOR_KNOWLEDGE)
serverIpv6.protocols = listOf(Protocol.H2_PRIOR_KNOWLEDGE)

// Yield the first IP address so the second IP address completes first.
val firstConnectLatch = CountDownLatch(1)
// Stall IPv6 so the IPv4 address completes first.
val ipv6ConnectLatch = CountDownLatch(1)
val socketFactory =
object : DelegatingSocketFactory(SocketFactory.getDefault()) {
var first = true

override fun createSocket(): Socket {
if (first) {
first = false
firstConnectLatch.await()
return object : Socket() {
override fun connect(
endpoint: SocketAddress,
timeout: Int,
) {
val address = (endpoint as? InetSocketAddress)?.address
if (address == localhostIpv6) {
ipv6ConnectLatch.await()
}
super.connect(endpoint, timeout)
}
}
return super.createSocket()
}
}

Expand All @@ -305,7 +312,7 @@ class FastFallbackTest {
try {
chain.proceed(chain.request())
} finally {
firstConnectLatch.countDown()
ipv6ConnectLatch.countDown()
}
},
).build()
Expand Down