gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

http3: fix flaky Extended CONNECT unit test (#4537)

Browse Source
This commit is contained in:
Marten Seemann
2024-05-28 12:43:01 +08:00
committed by GitHub
parent 21b643eeea
commit ae90c76822
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
http3/client_test.go
View File

@@ -419,9 +419,12 @@ var _ = Describe("Client", func() {
It("rejects Extended CONNECT requests if the server doesn't enable it", func() { It("rejects Extended CONNECT requests if the server doesn't enable it", func() {
sendSettings() sendSettings()
done := make(chan struct{}) done := make(chan struct{})
var wg sync.WaitGroup
wg.Add(2)
conn := mockquic.NewMockEarlyConnection(mockCtrl) conn := mockquic.NewMockEarlyConnection(mockCtrl)
conn.EXPECT().OpenUniStream().DoAndReturn(func() (quic.SendStream, error) { conn.EXPECT().OpenUniStream().DoAndReturn(func() (quic.SendStream, error) {
<-done <-done
wg.Done()
return nil, errors.New("test done") return nil, errors.New("test done")
}).MaxTimes(1) }).MaxTimes(1)
b := quicvarint.Append(nil, streamTypeControlStream) b := quicvarint.Append(nil, streamTypeControlStream)
@@ -432,6 +435,7 @@ var _ = Describe("Client", func() {
conn.EXPECT().AcceptUniStream(gomock.Any()).Return(controlStr, nil) conn.EXPECT().AcceptUniStream(gomock.Any()).Return(controlStr, nil)
conn.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) { conn.EXPECT().AcceptUniStream(gomock.Any()).DoAndReturn(func(context.Context) (quic.ReceiveStream, error) {
<-done <-done
wg.Done()
return nil, errors.New("test done") return nil, errors.New("test done")
}) })
conn.EXPECT().HandshakeComplete().Return(handshakeChan) conn.EXPECT().HandshakeComplete().Return(handshakeChan)
@@ -448,6 +452,7 @@ var _ = Describe("Client", func() {
// test shutdown // test shutdown
conn.EXPECT().CloseWithError(gomock.Any(), gomock.Any()).MaxTimes(1) conn.EXPECT().CloseWithError(gomock.Any(), gomock.Any()).MaxTimes(1)
close(done) close(done)
wg.Wait()
}) })
}) })