From e8a028945514e8a8d9344882dde81ad83235a5d7 Mon Sep 17 00:00:00 2001 From: ahrtr Date: Sat, 30 Oct 2021 14:49:09 +0800 Subject: [PATCH] replace ioutil with io and os for pkg/api --- pkg/api/testing/conversion_test.go | 6 +++--- pkg/api/testing/deep_copy_test.go | 6 +++--- pkg/api/testing/serialization_test.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/api/testing/conversion_test.go b/pkg/api/testing/conversion_test.go index 3fea8c005df..02ea015d37e 100644 --- a/pkg/api/testing/conversion_test.go +++ b/pkg/api/testing/conversion_test.go @@ -17,8 +17,8 @@ limitations under the License. package testing import ( - "io/ioutil" "math/rand" + "os" "testing" "github.com/google/go-cmp/cmp" @@ -59,7 +59,7 @@ func BenchmarkPodConversion(b *testing.B) { } func BenchmarkNodeConversion(b *testing.B) { - data, err := ioutil.ReadFile("node_example.json") + data, err := os.ReadFile("node_example.json") if err != nil { b.Fatalf("Unexpected error while reading file: %v", err) } @@ -89,7 +89,7 @@ func BenchmarkNodeConversion(b *testing.B) { } func BenchmarkReplicationControllerConversion(b *testing.B) { - data, err := ioutil.ReadFile("replication_controller_example.json") + data, err := os.ReadFile("replication_controller_example.json") if err != nil { b.Fatalf("Unexpected error while reading file: %v", err) } diff --git a/pkg/api/testing/deep_copy_test.go b/pkg/api/testing/deep_copy_test.go index be6bdea61a9..06dfb3bf94b 100644 --- a/pkg/api/testing/deep_copy_test.go +++ b/pkg/api/testing/deep_copy_test.go @@ -17,7 +17,7 @@ limitations under the License. package testing import ( - "io/ioutil" + "os" "testing" "time" @@ -140,7 +140,7 @@ func BenchmarkPodCopy(b *testing.B) { } func BenchmarkNodeCopy(b *testing.B) { - data, err := ioutil.ReadFile("node_example.json") + data, err := os.ReadFile("node_example.json") if err != nil { b.Fatalf("Unexpected error while reading file: %v", err) } @@ -159,7 +159,7 @@ func BenchmarkNodeCopy(b *testing.B) { } func BenchmarkReplicationControllerCopy(b *testing.B) { - data, err := ioutil.ReadFile("replication_controller_example.json") + data, err := os.ReadFile("replication_controller_example.json") if err != nil { b.Fatalf("Unexpected error while reading file: %v", err) } diff --git a/pkg/api/testing/serialization_test.go b/pkg/api/testing/serialization_test.go index 31cd68326ad..a8609ff0eaf 100644 --- a/pkg/api/testing/serialization_test.go +++ b/pkg/api/testing/serialization_test.go @@ -20,7 +20,7 @@ import ( "bytes" "encoding/hex" gojson "encoding/json" - "io/ioutil" + "io" "math/rand" "reflect" "testing" @@ -363,7 +363,7 @@ func TestObjectWatchFraming(t *testing.T) { if n, err := w.Write(obj.Bytes()); err != nil || n != len(obj.Bytes()) { t.Fatal(err) } - sr := streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s) + sr := streaming.NewDecoder(framer.NewFrameReader(io.NopCloser(out)), s) resultSecret := &v1.Secret{} res, _, err := sr.Decode(nil, resultSecret) if err != nil { @@ -392,7 +392,7 @@ func TestObjectWatchFraming(t *testing.T) { if n, err := w.Write(obj.Bytes()); err != nil || n != len(obj.Bytes()) { t.Fatal(err) } - sr = streaming.NewDecoder(framer.NewFrameReader(ioutil.NopCloser(out)), s) + sr = streaming.NewDecoder(framer.NewFrameReader(io.NopCloser(out)), s) outEvent := &metav1.WatchEvent{} _, _, err = sr.Decode(nil, outEvent) if err != nil || outEvent.Type != string(watch.Added) {