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

http3: remove RoundTripOpt.CheckSettings (#4416)

Browse Source 
The settings can be obtained from the SingleDestinationRoundTripper.
This commit is contained in:
Marten Seemann
2024-04-20 11:42:33 +02:00
committed by GitHub
parent 9bc7bd84cc
commit 18422ad1c4
6 changed files with 116 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
http3/roundtrip_test.go
View File

@@ -249,8 +249,8 @@ var _ = Describe("RoundTripper", func() {
close(handshakeChan)
conn.EXPECT().HandshakeComplete().Return(handshakeChan).MaxTimes(2)
cl.EXPECT().RoundTripOpt(req1, gomock.Any()).Return(&http.Response{Request: req1}, nil)
cl.EXPECT().RoundTripOpt(req2, gomock.Any()).Return(&http.Response{Request: req2}, nil)
cl.EXPECT().RoundTrip(req1).Return(&http.Response{Request: req1}, nil)
cl.EXPECT().RoundTrip(req2).Return(&http.Response{Request: req2}, nil)
var count int
rt.Dial = func(context.Context, string, *tls.Config, *quic.Config) (quic.EarlyConnection, error) {
count++
@@ -286,8 +286,8 @@ var _ = Describe("RoundTripper", func() {
handshakeChan := make(chan struct{})
close(handshakeChan)
conn.EXPECT().HandshakeComplete().Return(handshakeChan).MaxTimes(2)
cl1.EXPECT().RoundTripOpt(req1, gomock.Any()).Return(nil, testErr)
cl2.EXPECT().RoundTripOpt(req2, gomock.Any()).Return(&http.Response{Request: req2}, nil)
cl1.EXPECT().RoundTrip(req1).Return(nil, testErr)
cl2.EXPECT().RoundTrip(req2).Return(&http.Response{Request: req2}, nil)
_, err = rt.RoundTrip(req1)
Expect(err).To(MatchError(testErr))
rsp, err := rt.RoundTrip(req2)
@@ -317,8 +317,8 @@ var _ = Describe("RoundTripper", func() {
handshakeChan := make(chan struct{})
close(handshakeChan)
conn.EXPECT().HandshakeComplete().Return(handshakeChan).MaxTimes(2)
cl1.EXPECT().RoundTripOpt(req1, gomock.Any()).Return(nil, testErr)
cl1.EXPECT().RoundTripOpt(req2, gomock.Any()).Return(&http.Response{Request: req2}, nil)
cl1.EXPECT().RoundTrip(req1).Return(nil, testErr)
cl1.EXPECT().RoundTrip(req2).Return(&http.Response{Request: req2}, nil)
_, err = rt.RoundTrip(req1)
Expect(err).To(MatchError(testErr))
rsp, err := rt.RoundTrip(req2)
@@ -330,7 +330,7 @@ var _ = Describe("RoundTripper", func() {
It("recreates a client when a request times out", func() {
var reqCount int
cl1 := NewMockSingleRoundTripper(mockCtrl)
cl1.EXPECT().RoundTripOpt(gomock.Any(), gomock.Any()).DoAndReturn(func(req *http.Request, _ RoundTripOpt) (*http.Response, error) {
cl1.EXPECT().RoundTrip(gomock.Any()).DoAndReturn(func(req *http.Request) (*http.Response, error) {
reqCount++
if reqCount == 1 { // the first request is successful...
Expect(req.URL).To(Equal(req1.URL))
@@ -341,7 +341,7 @@ var _ = Describe("RoundTripper", func() {
return nil, &qerr.IdleTimeoutError{}
}).Times(2)
cl2 := NewMockSingleRoundTripper(mockCtrl)
cl2.EXPECT().RoundTripOpt(gomock.Any(), gomock.Any()).DoAndReturn(func(req *http.Request, _ RoundTripOpt) (*http.Response, error) {
cl2.EXPECT().RoundTrip(gomock.Any()).DoAndReturn(func(req *http.Request) (*http.Response, error) {
return &http.Response{Request: req}, nil
})
clientChan <- cl1
@@ -372,7 +372,7 @@ var _ = Describe("RoundTripper", func() {
}
rt.newClient = func(quic.EarlyConnection) singleRoundTripper {
cl := NewMockSingleRoundTripper(mockCtrl)
cl.EXPECT().RoundTripOpt(gomock.Any(), gomock.Any()).Return(nil, &qerr.IdleTimeoutError{})
cl.EXPECT().RoundTrip(gomock.Any()).Return(nil, &qerr.IdleTimeoutError{})
return cl
}
_, err := rt.RoundTrip(req1)
@@ -385,7 +385,7 @@ var _ = Describe("RoundTripper", func() {
reqs := make(chan struct{}, 2)
cl := NewMockSingleRoundTripper(mockCtrl)
cl.EXPECT().RoundTripOpt(gomock.Any(), gomock.Any()).DoAndReturn(func(req *http.Request, _ RoundTripOpt) (*http.Response, error) {
cl.EXPECT().RoundTrip(gomock.Any()).DoAndReturn(func(req *http.Request) (*http.Response, error) {
reqs <- struct{}{}
<-wait
return nil, &qerr.IdleTimeoutError{}
@@ -503,7 +503,7 @@ var _ = Describe("RoundTripper", func() {
},
newClient: func(quic.EarlyConnection) singleRoundTripper {
cl := NewMockSingleRoundTripper(mockCtrl)
cl.EXPECT().RoundTripOpt(gomock.Any(), gomock.Any()).Return(&http.Response{}, nil)
cl.EXPECT().RoundTrip(gomock.Any()).Return(&http.Response{}, nil)
return cl
},
}
@@ -544,7 +544,7 @@ var _ = Describe("RoundTripper", func() {
reqFinished := make(chan struct{})
rt.newClient = func(quic.EarlyConnection) singleRoundTripper {
cl := NewMockSingleRoundTripper(mockCtrl)
cl.EXPECT().RoundTripOpt(gomock.Any(), gomock.Any()).DoAndReturn(func(r *http.Request, _ RoundTripOpt) (*http.Response, error) {
cl.EXPECT().RoundTrip(gomock.Any()).DoAndReturn(func(r *http.Request) (*http.Response, error) {
roundTripCalled <- struct{}{}
<-r.Context().Done()
return nil, nil