Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/docker: remove deprecated io/ioutil 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0e3197ebd4)
Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Sebastiaan van Stijn 2022-02-25 15:31:22 +01:00 committed by Cory Snider
parent a0f0a4fe7a
commit f471347d88
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/docker/docker_test.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"bytes" "bytes"
"io" "io"
"io/ioutil"
"os" "os"
"testing" "testing"
@ -30,7 +29,7 @@ func TestClientDebugEnabled(t *testing.T) {
assert.Check(t, is.Equal(logrus.DebugLevel, logrus.GetLevel())) assert.Check(t, is.Equal(logrus.DebugLevel, logrus.GetLevel()))
} }
var discard = ioutil.NopCloser(bytes.NewBuffer(nil)) var discard = io.NopCloser(bytes.NewBuffer(nil))
func runCliCommand(t *testing.T, r io.ReadCloser, w io.Writer, args ...string) error { func runCliCommand(t *testing.T, r io.ReadCloser, w io.Writer, args ...string) error {
t.Helper() t.Helper()
@ -38,7 +37,7 @@ func runCliCommand(t *testing.T, r io.ReadCloser, w io.Writer, args ...string) e
r = discard r = discard
} }
if w == nil { if w == nil {
w = ioutil.Discard w = io.Discard
} }
cli, err := command.NewDockerCli(command.WithInputStream(r), command.WithCombinedStreams(w)) cli, err := command.NewDockerCli(command.WithInputStream(r), command.WithCombinedStreams(w))
assert.NilError(t, err) assert.NilError(t, err)