From 82a384743984cbf8d71e855c568a48b7632d79a6 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Wed, 29 May 2024 13:57:43 +0800 Subject: [PATCH] http3: fix another flaky Extended CONNECT test (#4539) --- http3/client_test.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/http3/client_test.go b/http3/client_test.go index a01272ddf..f368ffa9a 100644 --- a/http3/client_test.go +++ b/http3/client_test.go @@ -384,9 +384,12 @@ var _ = Describe("Client", func() { It("checks the server's SETTINGS before sending an Extended CONNECT request", func() { sendSettings() done := make(chan struct{}) + var wg sync.WaitGroup + wg.Add(2) conn := mockquic.NewMockEarlyConnection(mockCtrl) conn.EXPECT().OpenUniStream().DoAndReturn(func() (quic.SendStream, error) { <-done + wg.Done() return nil, errors.New("test done") }).MaxTimes(1) b := quicvarint.Append(nil, streamTypeControlStream) @@ -397,6 +400,7 @@ var _ = Describe("Client", func() { conn.EXPECT().AcceptUniStream(gomock.Any()).Return(controlStr, nil) conn.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) { <-done + wg.Done() return nil, errors.New("test done") }) conn.EXPECT().HandshakeComplete().Return(handshakeChan) @@ -414,6 +418,7 @@ var _ = Describe("Client", func() { // test shutdown conn.EXPECT().CloseWithError(gomock.Any(), gomock.Any()).MaxTimes(1) close(done) + wg.Wait() }) It("rejects Extended CONNECT requests if the server doesn't enable it", func() {