InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move from io/ioutil to io and os package

Browse Source 
The io/ioutil package has been deprecated in Go 1.16. This commit
replaces the existing io/ioutil functions with their new definitions in
io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun
2021-08-24 18:10:50 +08:00
parent 2b70006e3b
commit c55a4ac779
397 changed files with 1371 additions and 1606 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/image_pull_test.go
View File

@@ -4,7 +4,7 @@ import (
"bytes"
"context"
"fmt"
"io/ioutil"
"io"
"net/http"
"strings"
"testing"
@@ -87,7 +87,7 @@ func TestImagePullWithPrivilegedFuncNoError(t *testing.T) {
if auth == "NotValid" {
return &http.Response{
StatusCode: http.StatusUnauthorized,
Body: ioutil.NopCloser(bytes.NewReader([]byte("Invalid credentials"))),
Body: io.NopCloser(bytes.NewReader([]byte("Invalid credentials"))),
}, nil
}
if auth != "IAmValid" {
@@ -104,7 +104,7 @@ func TestImagePullWithPrivilegedFuncNoError(t *testing.T) {
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader([]byte("hello world"))),
Body: io.NopCloser(bytes.NewReader([]byte("hello world"))),
}, nil
}),
}
@@ -118,7 +118,7 @@ func TestImagePullWithPrivilegedFuncNoError(t *testing.T) {
if err != nil {
t.Fatal(err)
}
body, err := ioutil.ReadAll(resp)
body, err := io.ReadAll(resp)
if err != nil {
t.Fatal(err)
}
@@ -178,7 +178,7 @@ func TestImagePullWithoutErrors(t *testing.T) {
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader([]byte(expectedOutput))),
Body: io.NopCloser(bytes.NewReader([]byte(expectedOutput))),
}, nil
}),
}
@@ -188,7 +188,7 @@ func TestImagePullWithoutErrors(t *testing.T) {
if err != nil {
t.Fatal(err)
}
body, err := ioutil.ReadAll(resp)
body, err := io.ReadAll(resp)
if err != nil {
t.Fatal(err)
}