github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. 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-09-10 20:28:11 +08:00
parent c16be1a5e2
commit 50da673592
126 changed files with 291 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
snapshots/storage/metastore_bench_test.go
View File

@@ -19,7 +19,6 @@ package storage
import (
"context"
"fmt"
"io/ioutil"
"os"
"testing"
@@ -43,7 +42,7 @@ func Benchmarks(b *testing.B, name string, metaFn metaFactory) {
func makeBench(b *testing.B, name string, metaFn metaFactory, fn func(context.Context, *testing.B, *MetaStore)) func(b *testing.B) {
return func(b *testing.B) {
ctx := context.Background()
tmpDir, err := ioutil.TempDir("", "metastore-bench-"+name+"-")
tmpDir, err := os.MkdirTemp("", "metastore-bench-"+name+"-")
if err != nil {
b.Fatal(err)
}
@@ -68,7 +67,7 @@ func makeBench(b *testing.B, name string, metaFn metaFactory, fn func(context.Co
func openCloseWritable(b *testing.B, name string, metaFn metaFactory) func(b *testing.B) {
return func(b *testing.B) {
ctx := context.Background()
tmpDir, err := ioutil.TempDir("", "metastore-bench-"+name+"-")
tmpDir, err := os.MkdirTemp("", "metastore-bench-"+name+"-")
if err != nil {
b.Fatal(err)
}
@@ -96,7 +95,7 @@ func openCloseWritable(b *testing.B, name string, metaFn metaFactory) func(b *te
func openCloseReadonly(b *testing.B, name string, metaFn metaFactory) func(b *testing.B) {
return func(b *testing.B) {
ctx := context.Background()
tmpDir, err := ioutil.TempDir("", "metastore-bench-"+name+"-")
tmpDir, err := os.MkdirTemp("", "metastore-bench-"+name+"-")
if err != nil {
b.Fatal(err)
}

3
snapshots/storage/metastore_test.go
View File

@@ -19,7 +19,6 @@ package storage
import (
"context"
"fmt"
"io/ioutil"
"os"
"testing"
"time"
@@ -67,7 +66,7 @@ func MetaStoreSuite(t *testing.T, name string, meta func(root string) (*MetaStor
func makeTest(t *testing.T, name string, metaFn metaFactory, fn testFunc) func(t *testing.T) {
return func(t *testing.T) {
ctx := context.Background()
tmpDir, err := ioutil.TempDir("", "metastore-test-"+name+"-")
tmpDir, err := os.MkdirTemp("", "metastore-test-"+name+"-")
if err != nil {
t.Fatal(err)
}