Merge v2.10 into v3.0
This commit is contained in:
commit
e29a142f6a
118 changed files with 1324 additions and 1290 deletions
|
@ -98,7 +98,7 @@ func TestHijack(t *testing.T) {
|
|||
var mirrorRequest bool
|
||||
err := mirror.AddMirror(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
||||
hijacker, ok := rw.(http.Hijacker)
|
||||
assert.Equal(t, true, ok)
|
||||
assert.True(t, ok)
|
||||
|
||||
_, _, err := hijacker.Hijack()
|
||||
assert.Error(t, err)
|
||||
|
@ -109,7 +109,7 @@ func TestHijack(t *testing.T) {
|
|||
mirror.ServeHTTP(httptest.NewRecorder(), httptest.NewRequest(http.MethodGet, "/", nil))
|
||||
|
||||
pool.Stop()
|
||||
assert.Equal(t, true, mirrorRequest)
|
||||
assert.True(t, mirrorRequest)
|
||||
}
|
||||
|
||||
func TestFlush(t *testing.T) {
|
||||
|
@ -122,7 +122,7 @@ func TestFlush(t *testing.T) {
|
|||
var mirrorRequest bool
|
||||
err := mirror.AddMirror(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
|
||||
hijacker, ok := rw.(http.Flusher)
|
||||
assert.Equal(t, true, ok)
|
||||
assert.True(t, ok)
|
||||
|
||||
hijacker.Flush()
|
||||
|
||||
|
@ -133,7 +133,7 @@ func TestFlush(t *testing.T) {
|
|||
mirror.ServeHTTP(httptest.NewRecorder(), httptest.NewRequest(http.MethodGet, "/", nil))
|
||||
|
||||
pool.Stop()
|
||||
assert.Equal(t, true, mirrorRequest)
|
||||
assert.True(t, mirrorRequest)
|
||||
}
|
||||
|
||||
func TestMirroringWithBody(t *testing.T) {
|
||||
|
@ -233,7 +233,7 @@ func TestCloneRequest(t *testing.T) {
|
|||
|
||||
_, expectedBytes, err := newReusableRequest(req, 2)
|
||||
assert.Error(t, err)
|
||||
assert.Equal(t, bb[:3], expectedBytes)
|
||||
assert.Equal(t, expectedBytes, bb[:3])
|
||||
})
|
||||
|
||||
t.Run("valid case with maxBodySize", func(t *testing.T) {
|
||||
|
@ -258,7 +258,7 @@ func TestCloneRequest(t *testing.T) {
|
|||
rr, expectedBytes, err := newReusableRequest(req, 20)
|
||||
assert.NoError(t, err)
|
||||
assert.Nil(t, expectedBytes)
|
||||
assert.Len(t, rr.body, 0)
|
||||
assert.Empty(t, rr.body)
|
||||
})
|
||||
|
||||
t.Run("no request given", func(t *testing.T) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue