From f3f83a89d58b09b3676c1425d10341c34ccad91d Mon Sep 17 00:00:00 2001 From: "xin.li" Date: Thu, 22 Dec 2022 13:30:03 +0800 Subject: [PATCH] cleanup: remove ioutil for new go version Signed-off-by: xin.li --- bench_test.go | 4 ++-- integration/docker_test.go | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bench_test.go b/bench_test.go index 4d3205c..6287744 100644 --- a/bench_test.go +++ b/bench_test.go @@ -16,7 +16,7 @@ package zetcd import ( "fmt" - "io/ioutil" + "io" "log" "testing" "time" @@ -31,7 +31,7 @@ const ( var acl = zk.WorldACL(zk.PermAll) -func init() { zk.DefaultLogger = log.New(ioutil.Discard, "", 0) } +func init() { zk.DefaultLogger = log.New(io.Discard, "", 0) } func benchGet(b *testing.B, addr string) { c, _, err := zk.Connect([]string{addr}, time.Second) diff --git a/integration/docker_test.go b/integration/docker_test.go index 52be0c6..01df418 100644 --- a/integration/docker_test.go +++ b/integration/docker_test.go @@ -20,12 +20,9 @@ import ( "archive/tar" "bytes" "io" - "io/ioutil" "os" "strings" "time" - - "github.com/fsouza/go-dockerclient" ) type Container struct { @@ -129,7 +126,7 @@ func buildTar(files ...string) (io.Reader, error) { defer tr.Close() now := time.Now() for _, f := range files { - dat, derr := ioutil.ReadFile(f) + dat, derr := os.ReadFile(f) if derr != nil { return nil, derr }