hoelee/cloudflared
1
0
Fork 0
mirror of https://github.com/cloudflare/cloudflared.git synced 2025-07-27 19:39:57 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

TUN-6876: Fix flaky TestTraceICMPRouterEcho by taking account request span can return before reply

Browse Source
This commit is contained in:
Chung-Ting
2022-10-19 14:37:10 +01:00
parent 4d32a64f98
commit b1de2a74fa
2 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ingress/icmp_posix_test.go
View File

@@ -57,13 +57,13 @@ func TestFunnelIdleTimeout(t *testing.T) {
datagramMuxer: muxer,
}
require.NoError(t, proxy.Request(ctx, &pk, &responder))
validateEchoFlow(t, muxer, &pk)
validateEchoFlow(t, <-muxer.cfdToEdge, &pk)
// Send second request, should reuse the funnel
require.NoError(t, proxy.Request(ctx, &pk, &packetResponder{
datagramMuxer: nil,
}))
validateEchoFlow(t, muxer, &pk)
validateEchoFlow(t, <-muxer.cfdToEdge, &pk)
time.Sleep(idleTimeout * 2)
newMuxer := newMockMuxer(0)
@@ -71,7 +71,7 @@ func TestFunnelIdleTimeout(t *testing.T) {
datagramMuxer: newMuxer,
}
require.NoError(t, proxy.Request(ctx, &pk, &newResponder))
validateEchoFlow(t, newMuxer, &pk)
validateEchoFlow(t, <-newMuxer.cfdToEdge, &pk)
cancel()
<-proxyDone