diff options
author | Aoang <aoang@x2oe.com> | 2022-09-16 03:28:25 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-15 22:28:25 +0300 |
commit | a696949f6c1b7eec6d6529f8e93612e65d0f5ec2 (patch) | |
tree | 02ec801ab0c707cfdee13991926d83ac2ceaaece /server_test.go | |
parent | Improve isTLSAlready check (diff) | |
download | fasthttp-a696949f6c1b7eec6d6529f8e93612e65d0f5ec2.tar.gz fasthttp-a696949f6c1b7eec6d6529f8e93612e65d0f5ec2.tar.bz2 fasthttp-a696949f6c1b7eec6d6529f8e93612e65d0f5ec2.zip |
Deprecate Go 1.15 (#1379)
* Dropping support for 1.15.
* Replaces Go 1.16 Deprecated functions
* Update test build flag
* Fix import sort and comment
* Update github.com/klauspost/compress to v1.15.9
https://github.com/klauspost/compress improved performance and changed Minimum version is 1.16, this should be the final supported release for Go 1.16 (https://github.com/klauspost/compress/commit/6d0019a95afa3221f7522d1f2eed0033b5e79470) .
Diffstat (limited to 'server_test.go')
-rw-r--r-- | server_test.go | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/server_test.go b/server_test.go index 1a2adcc..af3cd4a 100644 --- a/server_test.go +++ b/server_test.go @@ -1,5 +1,3 @@ -// go:build !windows || !race - package fasthttp import ( @@ -10,7 +8,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "mime/multipart" "net" "os" @@ -351,7 +348,7 @@ func TestSaveMultipartFile(t *testing.T) { } defer os.Remove("filea.txt") - if c, err := ioutil.ReadFile("filea.txt"); err != nil { + if c, err := os.ReadFile("filea.txt"); err != nil { t.Fatal(err) } else if string(c) != filea { t.Fatalf("filea changed expected %q got %q", filea, c) @@ -371,7 +368,7 @@ func TestSaveMultipartFile(t *testing.T) { } defer os.Remove("fileb.txt") - if c, err := ioutil.ReadFile("fileb.txt"); err != nil { + if c, err := os.ReadFile("fileb.txt"); err != nil { t.Fatal(err) } else if string(c) != fileb { t.Fatalf("fileb changed expected %q got %q", fileb, c) @@ -394,7 +391,7 @@ func TestServerName(t *testing.T) { t.Fatalf("Unexpected error from serveConn: %v", err) } - resp, err := ioutil.ReadAll(&rw.w) + resp, err := io.ReadAll(&rw.w) if err != nil { t.Fatalf("Unexpected error from ReadAll: %v", err) } @@ -738,7 +735,7 @@ func TestServerResponseBodyStream(t *testing.T) { } close(readyCh) - tail, err := ioutil.ReadAll(br) + tail, err := io.ReadAll(br) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -811,7 +808,7 @@ func TestServerDisableKeepalive(t *testing.T) { } // make sure the connection is closed - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Errorf("unexpected error: %v", err) } @@ -1584,7 +1581,7 @@ func TestServerHTTP10ConnectionKeepAlive(t *testing.T) { tailCh := make(chan struct{}) go func() { - tail, err := ioutil.ReadAll(br) + tail, err := io.ReadAll(br) if err != nil { t.Errorf("error when reading tail: %v", err) } @@ -1659,7 +1656,7 @@ func TestServerHTTP10ConnectionClose(t *testing.T) { tailCh := make(chan struct{}) go func() { - tail, err := ioutil.ReadAll(br) + tail, err := io.ReadAll(br) if err != nil { t.Errorf("error when reading tail: %v", err) } @@ -1795,7 +1792,7 @@ func TestServerHeadRequest(t *testing.T) { t.Fatalf("unexpected content-type %q. Expecting %q", resp.Header.ContentType(), "aaa/bbb") } - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -1836,7 +1833,7 @@ func TestServerExpect100Continue(t *testing.T) { br := bufio.NewReader(&rw.w) verifyResponse(t, br, StatusOK, string(defaultContentType), "foobar") - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -1892,7 +1889,7 @@ func TestServerContinueHandler(t *testing.T) { br := bufio.NewReader(&rw.w) verifyResponse(t, br, expectedStatusCode, string(defaultContentType), expectedResponse) - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -2235,7 +2232,7 @@ func TestServeConnNonHTTP11KeepAlive(t *testing.T) { t.Fatal("expecting Connection: close") } - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -2377,7 +2374,7 @@ func TestRequestCtxSendFileModified(t *testing.T) { if err != nil { t.Fatalf("cannot open file: %v", err) } - body, err := ioutil.ReadAll(f) + body, err := io.ReadAll(f) f.Close() if err != nil { t.Fatalf("error when reading file: %v", err) @@ -2420,7 +2417,7 @@ func TestRequestCtxSendFile(t *testing.T) { if err != nil { t.Fatalf("cannot open file: %v", err) } - body, err := ioutil.ReadAll(f) + body, err := io.ReadAll(f) f.Close() if err != nil { t.Fatalf("error when reading file: %v", err) @@ -2521,7 +2518,7 @@ func testRequestCtxHijack(t *testing.T, s *Server) { br := bufio.NewReader(&rw.w) verifyResponse(t, br, StatusOK, "foo/bar", "hijack it!") - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Errorf("[iter: %d] Unexpected error when reading remaining data: %v", id, err) @@ -2884,7 +2881,7 @@ func TestServerTimeoutErrorWithResponse(t *testing.T) { verifyResponse(t, br, 456, "foo/bar", "path=/foo") verifyResponse(t, br, 456, "foo/bar", "path=/bar") - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -2918,7 +2915,7 @@ func TestServerTimeoutErrorWithCode(t *testing.T) { verifyResponse(t, br, StatusBadRequest, string(defaultContentType), "stolen ctx") verifyResponse(t, br, StatusBadRequest, string(defaultContentType), "stolen ctx") - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -2952,7 +2949,7 @@ func TestServerTimeoutError(t *testing.T) { verifyResponse(t, br, StatusRequestTimeout, string(defaultContentType), "stolen ctx") verifyResponse(t, br, StatusRequestTimeout, string(defaultContentType), "stolen ctx") - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -2987,7 +2984,7 @@ func TestServerMaxRequestsPerConn(t *testing.T) { } verifyResponseHeader(t, &resp.Header, 200, 0, string(defaultContentType), "") - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -3023,7 +3020,7 @@ func TestServerConnectionClose(t *testing.T) { t.Fatal("expecting Connection: close header") } - data, err := ioutil.ReadAll(br) + data, err := io.ReadAll(br) if err != nil { t.Fatalf("Unexpected error when reading remaining data: %v", err) } @@ -3686,7 +3683,7 @@ func TestStreamRequestBody(t *testing.T) { pipe := fasthttputil.NewPipeConns() cc, sc := pipe.Conn1(), pipe.Conn2() - //write headers and part1 body + // write headers and part1 body if _, err := cc.Write([]byte(fmt.Sprintf("POST /foo2 HTTP/1.1\r\nHost: aaa.com\r\nContent-Length: %d\r\nContent-Type: aa\r\n\r\n", contentLength))); err != nil { t.Fatal(err) } @@ -3743,7 +3740,7 @@ func TestStreamRequestBodyExceedMaxSize(t *testing.T) { pipe := fasthttputil.NewPipeConns() cc, sc := pipe.Conn1(), pipe.Conn2() - //write headers and part1 body + // write headers and part1 body if _, err := cc.Write([]byte(fmt.Sprintf("POST /foo2 HTTP/1.1\r\nHost: aaa.com\r\nContent-Length: %d\r\nContent-Type: aa\r\n\r\n%s", contentLength, part1))); err != nil { t.Error(err) } @@ -3845,12 +3842,12 @@ func TestMaxReadTimeoutPerRequest(t *testing.T) { pipe := fasthttputil.NewPipeConns() cc, sc := pipe.Conn1(), pipe.Conn2() go func() { - //write headers + // write headers _, err := cc.Write(headers) if err != nil { t.Error(err) } - //write body + // write body for i := 0; i < 5*1024; i++ { time.Sleep(time.Millisecond) cc.Write([]byte{'a'}) //nolint:errcheck @@ -3899,7 +3896,7 @@ func TestMaxWriteTimeoutPerRequest(t *testing.T) { var resp Response go func() { - //write headers + // write headers _, err := cc.Write(headers) if err != nil { t.Error(err) |