From 213b54b010bf2cf2f218f5a27cdb363f79642b48 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 12 Apr 2025 12:29:11 +0800 Subject: [PATCH] fix flaky TestServer0RTTReordering (#5032) --- server_test.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server_test.go b/server_test.go index 87935827..2ce8dc19 100644 --- a/server_test.go +++ b/server_test.go @@ -1165,12 +1165,13 @@ func TestServer0RTTReordering(t *testing.T) { server.handlePacket(p) // now receive the Initial + done := make(chan struct{}) initial := getValidInitialPacket(t, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 42}, randConnID(5), connID) packets := make(chan receivedPacket, protocol.Max0RTTQueueLen+1) conn.EXPECT().handlePacket(gomock.Any()).Do(func(p receivedPacket) { packets <- p }).AnyTimes() conn.EXPECT().Context().Return(context.Background()) conn.EXPECT().earlyConnReady().Return(make(chan struct{})) - conn.EXPECT().run() + conn.EXPECT().run().Do(func() error { close(done); return nil }) server.handlePacket(initial) for i := range protocol.Max0RTTQueueLen + 1 { @@ -1186,6 +1187,12 @@ func TestServer0RTTReordering(t *testing.T) { } } + select { + case <-done: + case <-time.After(time.Second): + t.Fatal("timeout") + } + // shutdown conn.EXPECT().closeWithTransportError(gomock.Any()).AnyTimes() }