diff --git a/benchmark/stat_test.go b/benchmark/stat_test.go index 7c0033298..7fa71d595 100644 --- a/benchmark/stat_test.go +++ b/benchmark/stat_test.go @@ -6,7 +6,6 @@ package benchmark import ( "fmt" - "io/ioutil" "log" "os" "os/exec" @@ -68,7 +67,7 @@ func TestNewStatFs(t *testing.T) { wd := setupFS(fs, 1, t) - names, err := ioutil.ReadDir(wd) + names, err := os.ReadDir(wd) if err != nil { t.Fatalf("failed: %v", err) } @@ -83,14 +82,14 @@ func TestNewStatFs(t *testing.T) { if !fi.IsDir() { t.Error("mode", fi) } - names, err = ioutil.ReadDir(wd + "/sub") + names, err = os.ReadDir(wd + "/sub") if err != nil { t.Fatalf("failed: %v", err) } if len(names) != 2 { t.Error("readdir /sub", names) } - names, err = ioutil.ReadDir(wd + "/sub/dir") + names, err = os.ReadDir(wd + "/sub/dir") if err != nil { t.Fatalf("failed: %v", err) } @@ -237,7 +236,7 @@ func BenchmarkCFuseThreadedStat(b *testing.B) { out = append(out, k) } - f, err := ioutil.TempFile("", "") + f, err := os.CreateTemp("", "") if err != nil { b.Fatalf("failed: %v", err) } diff --git a/fs/cache_test.go b/fs/cache_test.go index d9ebbdc0a..e85713ded 100644 --- a/fs/cache_test.go +++ b/fs/cache_test.go @@ -8,7 +8,6 @@ import ( "bytes" "context" "fmt" - "io/ioutil" "log" "os" "sync" @@ -98,12 +97,12 @@ func TestKeepCache(t *testing.T) { root := &keepCacheRoot{} mntDir, _ := testMount(t, root, nil) - c1, err := ioutil.ReadFile(mntDir + "/keep") + c1, err := os.ReadFile(mntDir + "/keep") if err != nil { t.Fatalf("read keep 1: %v", err) } - c2, err := ioutil.ReadFile(mntDir + "/keep") + c2, err := os.ReadFile(mntDir + "/keep") if err != nil { t.Fatalf("read keep 2: %v", err) } @@ -116,7 +115,7 @@ func TestKeepCache(t *testing.T) { t.Errorf("NotifyContent: %v", s) } - c3, err := ioutil.ReadFile(mntDir + "/keep") + c3, err := os.ReadFile(mntDir + "/keep") if err != nil { t.Fatalf("read keep 3: %v", err) } @@ -124,12 +123,12 @@ func TestKeepCache(t *testing.T) { t.Errorf("keep read 3 got %q want different", c3) } - nc1, err := ioutil.ReadFile(mntDir + "/nokeep") + nc1, err := os.ReadFile(mntDir + "/nokeep") if err != nil { t.Fatalf("read keep 1: %v", err) } - nc2, err := ioutil.ReadFile(mntDir + "/nokeep") + nc2, err := os.ReadFile(mntDir + "/nokeep") if err != nil { t.Fatalf("read keep 2: %v", err) } diff --git a/fs/example_test.go b/fs/example_test.go index f79b74e92..03d56e42c 100644 --- a/fs/example_test.go +++ b/fs/example_test.go @@ -6,7 +6,6 @@ package fs_test import ( "fmt" - "io/ioutil" "log" "os" @@ -17,7 +16,7 @@ import ( // ExampleMount shows how to create a loopback file system, and // mounting it onto a directory func Example_mount() { - mntDir, _ := ioutil.TempDir("", "") + mntDir, _ := os.MkdirTemp("", "") home := os.Getenv("HOME") // Make $HOME available on a mount dir under /tmp/ . Caution: // write operations are also mirrored. diff --git a/fs/forget_test.go b/fs/forget_test.go index b7f6a4840..e9eff8843 100644 --- a/fs/forget_test.go +++ b/fs/forget_test.go @@ -7,7 +7,6 @@ package fs import ( "context" "fmt" - "io/ioutil" "log" "os" "path/filepath" @@ -97,7 +96,7 @@ func TestForget(t *testing.T) { } log.Println("dropping cache") - if err := ioutil.WriteFile("/proc/sys/vm/drop_caches", []byte("2"), 0644); err != nil { + if err := os.WriteFile("/proc/sys/vm/drop_caches", []byte("2"), 0644); err != nil { } time.Sleep(time.Second) diff --git a/fs/inmemory_example_test.go b/fs/inmemory_example_test.go index c43686f3c..6e52df9c3 100644 --- a/fs/inmemory_example_test.go +++ b/fs/inmemory_example_test.go @@ -6,8 +6,8 @@ package fs_test import ( "context" - "io/ioutil" "log" + "os" "path/filepath" "strings" "syscall" @@ -75,7 +75,7 @@ func (root *inMemoryFS) OnAdd(ctx context.Context) { // read/write logic for the file is provided by the MemRegularFile type. func Example() { // This is where we'll mount the FS - mntDir, _ := ioutil.TempDir("", "") + mntDir, _ := os.MkdirTemp("", "") root := &inMemoryFS{} server, err := fs.Mount(mntDir, root, &fs.Options{ diff --git a/fs/loopback_linux_test.go b/fs/loopback_linux_test.go index 5880d5ebf..5c5746221 100644 --- a/fs/loopback_linux_test.go +++ b/fs/loopback_linux_test.go @@ -6,7 +6,6 @@ package fs import ( "bytes" - "io/ioutil" "os" "sync" "syscall" @@ -115,7 +114,7 @@ func TestCopyFileRange(t *testing.T) { if err != nil { t.Fatalf("Close dst: %v", err) } - c, err := ioutil.ReadFile(tc.mntDir + "/dst") + c, err := os.ReadFile(tc.mntDir + "/dst") if err != nil { t.Fatalf("ReadFile: %v", err) } @@ -153,7 +152,7 @@ func waitMount(mnt string) error { if err != nil { return err } - content, err := ioutil.ReadFile("/proc/self/mounts") + content, err := os.ReadFile("/proc/self/mounts") if err != nil { return err } diff --git a/fs/maxwrite_test.go b/fs/maxwrite_test.go index 0914a12dc..91da65178 100644 --- a/fs/maxwrite_test.go +++ b/fs/maxwrite_test.go @@ -7,7 +7,7 @@ package fs import ( "context" "fmt" - "io/ioutil" + "os" "strconv" "strings" "sync" @@ -245,7 +245,7 @@ func bdiReadahead(mnt string) int { panic(err) } path := fmt.Sprintf("/sys/class/bdi/%d:%d/read_ahead_kb", unix.Major(uint64(st.Dev)), unix.Minor(uint64(st.Dev))) - buf, err := ioutil.ReadFile(path) + buf, err := os.ReadFile(path) if err != nil { panic(err) } diff --git a/fs/mem_test.go b/fs/mem_test.go index 84550dd0e..29fd79590 100644 --- a/fs/mem_test.go +++ b/fs/mem_test.go @@ -8,7 +8,6 @@ import ( "bytes" "context" "fmt" - "io/ioutil" "math/rand" "os" "reflect" @@ -166,11 +165,11 @@ func TestDataFile(t *testing.T) { } replace := []byte("replaced!") - if err := ioutil.WriteFile(mntDir+"/file", replace, 0644); err != nil { + if err := os.WriteFile(mntDir+"/file", replace, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } - if gotBytes, err := ioutil.ReadFile(mntDir + "/file"); err != nil { + if gotBytes, err := os.ReadFile(mntDir + "/file"); err != nil { t.Fatalf("ReadFile: %v", err) } else if bytes.Compare(replace, gotBytes) != 0 { t.Fatalf("read: got %q want %q", gotBytes, replace) @@ -198,7 +197,7 @@ func TestDataFileLargeRead(t *testing.T) { n.AddChild("file", ch, false) }, }) - got, err := ioutil.ReadFile(mntDir + "/file") + got, err := os.ReadFile(mntDir + "/file") if err != nil { t.Fatalf("ReadFile: %v", err) } diff --git a/fs/simple_test.go b/fs/simple_test.go index 748e2c98b..b70e11db5 100644 --- a/fs/simple_test.go +++ b/fs/simple_test.go @@ -7,7 +7,6 @@ package fs import ( "context" "fmt" - "io/ioutil" "log" "os" "os/exec" @@ -42,7 +41,7 @@ type testCase struct { // writeOrig writes a file into the backing directory of the loopback mount func (tc *testCase) writeOrig(path, content string, mode os.FileMode) { - if err := ioutil.WriteFile(filepath.Join(tc.origDir, path), []byte(content), mode); err != nil { + if err := os.WriteFile(filepath.Join(tc.origDir, path), []byte(content), mode); err != nil { tc.Fatal(err) } } @@ -219,7 +218,7 @@ func TestReadDirStress(t *testing.T) { // Create 110 entries for i := 0; i < 110; i++ { name := fmt.Sprintf("file%036x", i) - if err := ioutil.WriteFile(filepath.Join(tc.mntDir, name), []byte("hello"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(tc.mntDir, name), []byte("hello"), 0644); err != nil { t.Fatalf("WriteFile %q: %v", name, err) } } @@ -394,7 +393,7 @@ func TestPosix(t *testing.T) { func TestOpenDirectIO(t *testing.T) { // Apparently, tmpfs does not allow O_DIRECT, so try to create // a test temp directory in /var/tmp. - ext4Dir, err := ioutil.TempDir("/var/tmp", "go-fuse.TestOpenDirectIO") + ext4Dir, err := os.MkdirTemp("/var/tmp", "go-fuse.TestOpenDirectIO") if err != nil { t.Fatalf("MkdirAll: %v", err) } diff --git a/fs/windows_test.go b/fs/windows_test.go index e811da982..e56b98784 100644 --- a/fs/windows_test.go +++ b/fs/windows_test.go @@ -6,7 +6,6 @@ package fs_test import ( "bytes" - "io/ioutil" "os" "syscall" "testing" @@ -34,11 +33,11 @@ func TestWindowsEmulations(t *testing.T) { data := []byte("hello") nm := mntDir + "/file" - if err := ioutil.WriteFile(nm, data, 0644); err != nil { + if err := os.WriteFile(nm, data, 0644); err != nil { t.Fatal(err) } - if got, err := ioutil.ReadFile(nm); err != nil { + if got, err := os.ReadFile(nm); err != nil { t.Fatal(err) } else if bytes.Compare(got, data) != 0 { t.Fatalf("got %q want %q", got, data) diff --git a/fs/zip_test.go b/fs/zip_test.go index 868c0a1b1..5ec099d2f 100644 --- a/fs/zip_test.go +++ b/fs/zip_test.go @@ -8,7 +8,6 @@ import ( "archive/zip" "bytes" "context" - "io/ioutil" "os" "path/filepath" "reflect" @@ -88,7 +87,7 @@ func TestZipFS(t *testing.T) { } continue } - c, err := ioutil.ReadFile(filepath.Join(mntDir, k)) + c, err := os.ReadFile(filepath.Join(mntDir, k)) if err != nil { t.Fatal(err) } @@ -97,7 +96,7 @@ func TestZipFS(t *testing.T) { } } - entries, err := ioutil.ReadDir(mntDir) + entries, err := os.ReadDir(mntDir) if err != nil { t.Fatal(err) } @@ -138,7 +137,7 @@ func TestZipFSOnAdd(t *testing.T) { } defer server.Unmount() - c, err := ioutil.ReadFile(mnt + "/sub/dir/subdir/subfile") + c, err := os.ReadFile(mnt + "/sub/dir/subdir/subfile") if err != nil { t.Fatal("ReadFile", err) } diff --git a/fs/zipfs_example_test.go b/fs/zipfs_example_test.go index cc8c62d0a..626189bc1 100644 --- a/fs/zipfs_example_test.go +++ b/fs/zipfs_example_test.go @@ -9,7 +9,7 @@ import ( "context" "flag" "fmt" - "io/ioutil" + "io" "log" "os" "path/filepath" @@ -51,7 +51,7 @@ func (zf *zipFile) Open(ctx context.Context, flags uint32) (fs.FileHandle, uint3 if err != nil { return nil, 0, syscall.EIO } - content, err := ioutil.ReadAll(rc) + content, err := io.ReadAll(rc) if err != nil { return nil, 0, syscall.EIO } diff --git a/fuse/mount_linux_test.go b/fuse/mount_linux_test.go index 9cfce07a3..26fdd6ec3 100644 --- a/fuse/mount_linux_test.go +++ b/fuse/mount_linux_test.go @@ -2,7 +2,6 @@ package fuse import ( "fmt" - "io/ioutil" "os" "syscall" "testing" @@ -17,11 +16,7 @@ import ( // In this test, we simulate a privileged parent by using the `fusermount` suid // helper. func TestMountDevFd(t *testing.T) { - realMountPoint, err := ioutil.TempDir("", t.Name()) - if err != nil { - t.Fatal(err) - } - defer syscall.Rmdir(realMountPoint) + realMountPoint := t.TempDir() // Call the fusermount suid helper to obtain the file descriptor in place // of a privileged parent. @@ -87,10 +82,7 @@ func TestMountMaxWrite(t *testing.T) { for _, o := range opts { name := fmt.Sprintf("MaxWrite%d", o.MaxWrite) t.Run(name, func(t *testing.T) { - mnt, err := ioutil.TempDir("", name) - if err != nil { - t.Fatal(err) - } + mnt := t.TempDir() fs := NewDefaultRawFileSystem() srv, err := NewServer(fs, mnt, &o) if err != nil { @@ -108,10 +100,7 @@ func TestMountMaxWrite(t *testing.T) { // The mount options are a comma-separated string like this: // rw,nosuid,nodev,relatime,user_id=1026,group_id=1026 func mountCheckOptions(t *testing.T, opts MountOptions) (info mountinfo.Info) { - mnt, err := ioutil.TempDir("", t.Name()) - if err != nil { - t.Fatal(err) - } + mnt := t.TempDir() fs := NewDefaultRawFileSystem() srv, err := NewServer(fs, mnt, &opts) if err != nil { diff --git a/fuse/nodefs/fileless_test.go b/fuse/nodefs/fileless_test.go index 48835fec6..a7143aedf 100644 --- a/fuse/nodefs/fileless_test.go +++ b/fuse/nodefs/fileless_test.go @@ -5,7 +5,7 @@ package nodefs import ( - "io/ioutil" + "os" "testing" "github.com/hanwen/go-fuse/v2/fuse" @@ -77,7 +77,7 @@ func TestNoOpen(t *testing.T) { t.Skip("Kernel does not support open-less read/writes. Skipping test.") } - content, err := ioutil.ReadFile(dir + "/file") + content, err := os.ReadFile(dir + "/file") if err != nil { t.Fatalf("ReadFile: %v", err) } @@ -86,7 +86,7 @@ func TestNoOpen(t *testing.T) { t.Fatalf("got %q, want %q", content, want) } - content, err = ioutil.ReadFile(dir + "/file2") + content, err = os.ReadFile(dir + "/file2") if err != nil { t.Fatalf("ReadFile: %v", err) } @@ -112,7 +112,7 @@ func TestNodeRead(t *testing.T) { if err := s.WaitMount(); err != nil { t.Fatal("WaitMount", err) } - content, err := ioutil.ReadFile(dir + "/file") + content, err := os.ReadFile(dir + "/file") if err != nil { t.Fatalf("ReadFile: %v", err) } diff --git a/fuse/nodefs/memnode_test.go b/fuse/nodefs/memnode_test.go index b9dbd59d6..266764a62 100644 --- a/fuse/nodefs/memnode_test.go +++ b/fuse/nodefs/memnode_test.go @@ -5,7 +5,6 @@ package nodefs import ( - "io/ioutil" "os" "testing" "time" @@ -54,12 +53,12 @@ func TestMemNodeFsWrite(t *testing.T) { wd, _ := setupMemNodeTest(t) want := "hello" - err := ioutil.WriteFile(wd+"/test", []byte(want), 0644) + err := os.WriteFile(wd+"/test", []byte(want), 0644) if err != nil { t.Fatalf("WriteFile failed: %v", err) } - content, err := ioutil.ReadFile(wd + "/test") + content, err := os.ReadFile(wd + "/test") if string(content) != want { t.Fatalf("content mismatch: got %q, want %q", content, want) } @@ -68,7 +67,7 @@ func TestMemNodeFsWrite(t *testing.T) { func TestMemNodeFsBasic(t *testing.T) { wd, _ := setupMemNodeTest(t) - err := ioutil.WriteFile(wd+"/test", []byte{42}, 0644) + err := os.WriteFile(wd+"/test", []byte{42}, 0644) if err != nil { t.Fatalf("WriteFile failed: %v", err) } @@ -81,7 +80,7 @@ func TestMemNodeFsBasic(t *testing.T) { t.Errorf("Size after write incorrect: got %d want 1", fi.Size()) } - entries, err := ioutil.ReadDir(wd) + entries, err := os.ReadDir(wd) if len(entries) != 1 || entries[0].Name() != "test" { t.Fatalf("Readdir got %v, expected 1 file named 'test'", entries) } diff --git a/fuse/pathfs/copy_test.go b/fuse/pathfs/copy_test.go index c3eb453e4..eba77dc8d 100644 --- a/fuse/pathfs/copy_test.go +++ b/fuse/pathfs/copy_test.go @@ -5,7 +5,7 @@ package pathfs import ( - "io/ioutil" + "os" "testing" ) @@ -18,7 +18,7 @@ func TestCopyFile(t *testing.T) { content1 := "blabla" - err := ioutil.WriteFile(d1+"/file", []byte(content1), 0644) + err := os.WriteFile(d1+"/file", []byte(content1), 0644) if err != nil { t.Fatalf("WriteFile failed: %v", err) } @@ -28,14 +28,14 @@ func TestCopyFile(t *testing.T) { t.Fatal("Unexpected ret code", code) } - data, err := ioutil.ReadFile(d2 + "/file") + data, err := os.ReadFile(d2 + "/file") if content1 != string(data) { t.Fatal("Unexpected content", string(data)) } content2 := "foobar" - err = ioutil.WriteFile(d2+"/file", []byte(content2), 0644) + err = os.WriteFile(d2+"/file", []byte(content2), 0644) if err != nil { t.Fatalf("WriteFile failed: %v", err) } @@ -46,7 +46,7 @@ func TestCopyFile(t *testing.T) { t.Fatal("Unexpected ret code", code) } - data, err = ioutil.ReadFile(d1 + "/file") + data, err = os.ReadFile(d1 + "/file") if content2 != string(data) { t.Fatal("Unexpected content", string(data)) } diff --git a/fuse/test/cache_test.go b/fuse/test/cache_test.go index 9f6ef00c1..6e5de0c2a 100644 --- a/fuse/test/cache_test.go +++ b/fuse/test/cache_test.go @@ -6,7 +6,6 @@ package test import ( "bytes" - "io/ioutil" "os" "runtime" "sync" @@ -78,14 +77,14 @@ func TestFopenKeepCache(t *testing.T) { // x{read,write}File reads/writes file@path and fail on error xreadFile := func(path string) string { - data, err := ioutil.ReadFile(path) + data, err := os.ReadFile(path) if err != nil { t.Fatal(err) } return string(data) } xwriteFile := func(path, data string) { - if err := ioutil.WriteFile(path, []byte(data), 0644); err != nil { + if err := os.WriteFile(path, []byte(data), 0644); err != nil { t.Fatal(err) } } @@ -243,7 +242,7 @@ func TestGetAttrRace(t *testing.T) { go func() { defer wg.Done() fn := dir + "/mnt/file" - err := ioutil.WriteFile(fn, []byte{42}, 0644) + err := os.WriteFile(fn, []byte{42}, 0644) if err != nil { statErr = err return diff --git a/fuse/test/cachecontrol_test.go b/fuse/test/cachecontrol_test.go index 6b41d3838..dbfac8426 100644 --- a/fuse/test/cachecontrol_test.go +++ b/fuse/test/cachecontrol_test.go @@ -9,7 +9,6 @@ package test import ( "bytes" "encoding/binary" - "io/ioutil" "os" "testing" @@ -82,7 +81,7 @@ func TestCacheControl(t *testing.T) { assertFileRead := func(subj, dataOK string) { t.Helper() - v, err := ioutil.ReadFile(dir + "/hello.txt") + v, err := os.ReadFile(dir + "/hello.txt") if err != nil { t.Fatalf("%s: file read: %s", subj, err) } diff --git a/fuse/test/defaultnode_test.go b/fuse/test/defaultnode_test.go index 4a2434b5d..b7f8aa9a3 100644 --- a/fuse/test/defaultnode_test.go +++ b/fuse/test/defaultnode_test.go @@ -5,7 +5,6 @@ package test import ( - "io/ioutil" "os" "path" "testing" @@ -59,7 +58,7 @@ func TestDefaultNodeGetAttr(t *testing.T) { } // But when we open the file, we should get the content - content, err := ioutil.ReadFile(filepath) + content, err := os.ReadFile(filepath) if err != nil { t.Fatalf("ReadFile: %v", err) } diff --git a/fuse/test/defaultread_test.go b/fuse/test/defaultread_test.go index 798d2d557..ec462f5f6 100644 --- a/fuse/test/defaultread_test.go +++ b/fuse/test/defaultread_test.go @@ -5,7 +5,7 @@ package test import ( - "io/ioutil" + "os" "testing" "github.com/hanwen/go-fuse/v2/fuse" @@ -63,7 +63,7 @@ func TestDefaultRead(t *testing.T) { root, clean := defaultReadTest(t) defer clean() - _, err := ioutil.ReadFile(root + "/file") + _, err := os.ReadFile(root + "/file") if err == nil { t.Fatal("should have failed read.") } diff --git a/fuse/test/delete_linux_test.go b/fuse/test/delete_linux_test.go index 182e3a387..b2f0125ac 100644 --- a/fuse/test/delete_linux_test.go +++ b/fuse/test/delete_linux_test.go @@ -6,7 +6,6 @@ package test import ( "bytes" - "io/ioutil" "os" "os/exec" "syscall" @@ -69,7 +68,7 @@ func TestDeleteNotify(t *testing.T) { } root.Inode().NewChild("testdir", true, &flip) - err = ioutil.WriteFile(mnt+"/testdir/testfile", []byte{42}, 0644) + err = os.WriteFile(mnt+"/testdir/testfile", []byte{42}, 0644) if err != nil { t.Fatal(err) } diff --git a/fuse/test/file_lock_test.go b/fuse/test/file_lock_test.go index 398f21c88..5b66ba3c9 100644 --- a/fuse/test/file_lock_test.go +++ b/fuse/test/file_lock_test.go @@ -8,7 +8,6 @@ package test import ( - "io/ioutil" "os" "os/exec" "path/filepath" @@ -225,7 +224,7 @@ func TestNoLockSupport(t *testing.T) { defer s.Unmount() fn := mnt + "/file.txt" - if err := ioutil.WriteFile(fn, []byte("content"), 0644); err != nil { + if err := os.WriteFile(fn, []byte("content"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } diff --git a/fuse/test/loopback_linux_test.go b/fuse/test/loopback_linux_test.go index 4c88c77b5..8a7fd7521 100644 --- a/fuse/test/loopback_linux_test.go +++ b/fuse/test/loopback_linux_test.go @@ -7,7 +7,6 @@ package test import ( "flag" "fmt" - "io/ioutil" "os" "path/filepath" "syscall" @@ -33,7 +32,7 @@ func TestTouch(t *testing.T) { defer ts.Cleanup() contents := []byte{1, 2, 3} - err := ioutil.WriteFile(ts.origFile, []byte(contents), 0700) + err := os.WriteFile(ts.origFile, []byte(contents), 0700) if err != nil { t.Fatalf("WriteFile failed: %v", err) } @@ -92,7 +91,7 @@ func TestUtimesNano(t *testing.T) { defer tc.Cleanup() path := tc.mountFile - err := ioutil.WriteFile(path, []byte("xyz"), 0600) + err := os.WriteFile(path, []byte("xyz"), 0600) if err != nil { t.Fatal(err) } @@ -213,7 +212,7 @@ func TestReaddirInodes(t *testing.T) { // create "hello.txt" filename := "hello.txt" path := tc.orig + "/" + filename - err := ioutil.WriteFile(path, []byte("xyz"), 0600) + err := os.WriteFile(path, []byte("xyz"), 0600) if err != nil { t.Fatal(err) } diff --git a/fuse/test/loopback_test.go b/fuse/test/loopback_test.go index 0763728f1..877911a9c 100644 --- a/fuse/test/loopback_test.go +++ b/fuse/test/loopback_test.go @@ -8,7 +8,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "math/rand" "os" "path/filepath" @@ -53,10 +52,10 @@ func (tc *testCase) Mkdir(name string, mode os.FileMode) { } } -// WriteFile is a utility wrapper for ioutil.WriteFile, aborting the +// WriteFile is a utility wrapper for os.WriteFile, aborting the // test if it fails. func (tc *testCase) WriteFile(name string, content []byte, mode os.FileMode) { - if err := ioutil.WriteFile(name, content, mode); err != nil { + if err := os.WriteFile(name, content, mode); err != nil { if len(content) > 50 { content = append(content[:50], '.', '.', '.') } @@ -268,7 +267,7 @@ func TestLinkCreate(t *testing.T) { if stat.Ino != subStat.Ino { t.Errorf("Link succeeded, but inode numbers different: %v %v", stat.Ino, subStat.Ino) } - readback, err := ioutil.ReadFile(mountSubfile) + readback, err := os.ReadFile(mountSubfile) if err != nil { t.Fatalf("ReadFile failed: %v", err) } @@ -279,7 +278,7 @@ func TestLinkCreate(t *testing.T) { t.Fatalf("Remove failed: %v", err) } - _, err = ioutil.ReadFile(mountSubfile) + _, err = os.ReadFile(mountSubfile) if err != nil { t.Fatalf("ReadFile failed: %v", err) } @@ -318,7 +317,7 @@ func TestLinkExisting(t *testing.T) { t.Errorf("linked files should have identical inodes %v %v", s1.Ino, s2.Ino) } - back, err := ioutil.ReadFile(tc.mnt + "/file1") + back, err := os.ReadFile(tc.mnt + "/file1") if err != nil { t.Fatalf("ReadFile failed: %v", err) } @@ -534,7 +533,7 @@ func TestReadZero(t *testing.T) { defer tc.Cleanup() tc.WriteFile(tc.origFile, []byte{}, 0644) - back, err := ioutil.ReadFile(tc.mountFile) + back, err := os.ReadFile(tc.mountFile) if err != nil { t.Fatalf("ReadFile(%q): %v", tc.mountFile, err) } else if len(back) != 0 { @@ -599,7 +598,7 @@ func TestReadLarge(t *testing.T) { content := randomData(385 * 1023) tc.WriteFile(tc.origFile, []byte(content), 0644) - back, err := ioutil.ReadFile(tc.mountFile) + back, err := os.ReadFile(tc.mountFile) if err != nil { t.Fatalf("ReadFile failed: %v", err) } @@ -613,7 +612,7 @@ func TestWriteLarge(t *testing.T) { content := randomData(385 * 1023) tc.WriteFile(tc.mountFile, []byte(content), 0644) - back, err := ioutil.ReadFile(tc.origFile) + back, err := os.ReadFile(tc.origFile) if err != nil { t.Fatalf("ReadFile failed: %v", err) } @@ -849,7 +848,7 @@ func TestLookupKnownChildrenAttrCopied(t *testing.T) { tc := NewTestCase(t) defer tc.Cleanup() - if err := ioutil.WriteFile(tc.mountFile, []byte("hello"), 0644); err != nil { + if err := os.WriteFile(tc.mountFile, []byte("hello"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -951,7 +950,7 @@ func testLoopbackUtimens(t *testing.T, path string, utimensFn func(atime *time.T // Check that loopbackFileSystem.Utimens() works as expected func TestPathfsLoopbackFileSystemUtimens(t *testing.T) { fs := pathfs.NewLoopbackFileSystem(os.TempDir()) - f, err := ioutil.TempFile("", "TestLoopbackFileSystemUtimens") + f, err := os.CreateTemp("", "TestLoopbackFileSystemUtimens") if err != nil { t.Fatal(err) } @@ -968,7 +967,7 @@ func TestPathfsLoopbackFileSystemUtimens(t *testing.T) { // Check that loopbackFile.Utimens() works as expected func TestNodefsLoopbackFileUtimens(t *testing.T) { - f2, err := ioutil.TempFile("", "TestLoopbackFileUtimens") + f2, err := os.CreateTemp("", "TestLoopbackFileUtimens") if err != nil { t.Fatal(err) } diff --git a/fuse/test/mount_test.go b/fuse/test/mount_test.go index 53c4c13da..3245c3bcc 100644 --- a/fuse/test/mount_test.go +++ b/fuse/test/mount_test.go @@ -5,7 +5,6 @@ package test import ( - "io/ioutil" "os" "path/filepath" "runtime" @@ -72,7 +71,7 @@ func TestMountReaddir(t *testing.T) { t.Fatal("mount should succeed") } - entries, err := ioutil.ReadDir(ts.mnt) + entries, err := os.ReadDir(ts.mnt) if err != nil { t.Fatalf("ReadDir failed: %v", err) } @@ -86,7 +85,7 @@ func TestRecursiveMount(t *testing.T) { ts := NewTestCase(t) defer ts.Cleanup() - err := ioutil.WriteFile(ts.orig+"/hello.txt", []byte("blabla"), 0644) + err := os.WriteFile(ts.orig+"/hello.txt", []byte("blabla"), 0644) if err != nil { t.Fatalf("WriteFile failed: %v", err) } @@ -186,7 +185,7 @@ func TestDefaultNodeMount(t *testing.T) { t.Fatalf("Mount: %v", err) } - if entries, err := ioutil.ReadDir(dir); err != nil { + if entries, err := os.ReadDir(dir); err != nil { t.Fatalf("ReadDir: %v", err) } else if len(entries) != 1 { t.Fatalf("got %d entries", len(entries)) @@ -208,7 +207,7 @@ func TestLiveness(t *testing.T) { } defer s.Unmount() - if _, err := ioutil.ReadDir(dir); err != nil { + if _, err := os.ReadDir(dir); err != nil { t.Fatalf("ReadDir: %v", err) } @@ -216,7 +215,7 @@ func TestLiveness(t *testing.T) { runtime.GC() runtime.GC() - if _, err := ioutil.ReadDir(dir); err != nil { + if _, err := os.ReadDir(dir); err != nil { t.Fatalf("ReadDir: %v", err) } } diff --git a/fuse/test/node_parallel_lookup_test.go b/fuse/test/node_parallel_lookup_test.go index 4b0d0ce41..32006a08c 100644 --- a/fuse/test/node_parallel_lookup_test.go +++ b/fuse/test/node_parallel_lookup_test.go @@ -9,8 +9,8 @@ package test import ( "context" "fmt" - "io/ioutil" "log" + "os" "testing" "golang.org/x/sync/errgroup" @@ -46,7 +46,7 @@ func (r *tRoot) Lookup(out *fuse.Attr, name string, fctx *fuse.Context) (*nodefs // verifyFileRead verifies that file @path has content == dataOK. func verifyFileRead(path string, dataOK string) error { - v, err := ioutil.ReadFile(path) + v, err := os.ReadFile(path) if err != nil { return err } diff --git a/fuse/test/nofile_test.go b/fuse/test/nofile_test.go index 2208fbcdb..290d90390 100644 --- a/fuse/test/nofile_test.go +++ b/fuse/test/nofile_test.go @@ -5,7 +5,7 @@ package test import ( - "io/ioutil" + "os" "sync/atomic" "testing" @@ -87,7 +87,7 @@ func TestNoFile(t *testing.T) { nopenPre := atomic.LoadInt32(&node.nopen) - v, err := ioutil.ReadFile(dir + path) + v, err := os.ReadFile(dir + path) if err != nil { t.Fatalf("%s: read: %s", path, err) } diff --git a/newunionfs/unionfs.go b/newunionfs/unionfs.go index a51d3e690..c9349523e 100644 --- a/newunionfs/unionfs.go +++ b/newunionfs/unionfs.go @@ -8,8 +8,8 @@ import ( "context" "crypto/md5" "fmt" - "io/ioutil" "log" + "os" "path/filepath" "sort" "syscall" @@ -85,7 +85,7 @@ func (r *unionFSRoot) writeMarker(name string) syscall.Errno { dest := r.markerPath(name) - err := ioutil.WriteFile(dest, []byte(name), 0644) + err := os.WriteFile(dest, []byte(name), 0644) return fs.ToErrno(err) } diff --git a/newunionfs/unionfs_test.go b/newunionfs/unionfs_test.go index b7873327f..8c6d58e7d 100644 --- a/newunionfs/unionfs_test.go +++ b/newunionfs/unionfs_test.go @@ -6,7 +6,6 @@ package unionfs import ( "bytes" - "io/ioutil" "os" "path/filepath" "reflect" @@ -69,7 +68,7 @@ func newTestCase(t *testing.T, populate bool) *testCase { tc.server = server if populate { - if err := ioutil.WriteFile(tc.ro+"/dir/ro-file", []byte("bla"), 0644); err != nil { + if err := os.WriteFile(tc.ro+"/dir/ro-file", []byte("bla"), 0644); err != nil { t.Fatal(err) } } @@ -100,7 +99,7 @@ func TestDelete(t *testing.T) { t.Fatal(err) } - c, err := ioutil.ReadFile(filepath.Join(tc.rw, delDir, filePathHash("dir/ro-file"))) + c, err := os.ReadFile(filepath.Join(tc.rw, delDir, filePathHash("dir/ro-file"))) if err != nil { t.Fatal(err) } @@ -150,11 +149,11 @@ func TestCreate(t *testing.T) { t.Fatalf("Unlink: %v", err) } want := []byte{42} - if err := ioutil.WriteFile(filepath.Join(tc.mnt, path), want, 0644); err != nil { + if err := os.WriteFile(filepath.Join(tc.mnt, path), want, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } - if got, err := ioutil.ReadFile(filepath.Join(tc.mnt, path)); err != nil { + if got, err := os.ReadFile(filepath.Join(tc.mnt, path)); err != nil { t.Fatalf("WriteFile: %v", err) } else if !bytes.Equal(got, want) { t.Errorf("got %q, want %q", got, want) @@ -169,11 +168,11 @@ func TestPromote(t *testing.T) { mPath := filepath.Join(tc.mnt, path) want := []byte{42} - if err := ioutil.WriteFile(mPath, want, 0644); err != nil { + if err := os.WriteFile(mPath, want, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } - if got, err := ioutil.ReadFile(mPath); err != nil { + if got, err := os.ReadFile(mPath); err != nil { t.Fatalf("ReadFile: %v", err) } else if !bytes.Equal(got, want) { t.Errorf("got %q, want %q", got, want) @@ -186,7 +185,7 @@ func TestDeleteRevert(t *testing.T) { path := "dir/ro-file" mPath := filepath.Join(tc.mnt, path) - if err := ioutil.WriteFile(mPath, []byte{42}, 0644); err != nil { + if err := os.WriteFile(mPath, []byte{42}, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -238,20 +237,20 @@ func TestReaddir(t *testing.T) { tc := newTestCase(t, true) defer tc.Clean() - if err := ioutil.WriteFile(tc.ro+"/dir/file2", nil, 0644); err != nil { + if err := os.WriteFile(tc.ro+"/dir/file2", nil, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } if err := os.Mkdir(tc.rw+"/dir", 0755); err != nil { t.Fatalf("Mkdir: %v", err) } - if err := ioutil.WriteFile(tc.rw+"/dir/file3", nil, 0644); err != nil { + if err := os.WriteFile(tc.rw+"/dir/file3", nil, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } if err := os.Remove(tc.mnt + "/dir/ro-file"); err != nil { t.Fatalf("Remove: %v", err) } - res, err := ioutil.ReadDir(tc.mnt + "/dir") + res, err := os.ReadDir(tc.mnt + "/dir") if err != nil { t.Fatalf("ReadDir: %v", err) } diff --git a/posixtest/test.go b/posixtest/test.go index b2226ec56..1a3996f24 100644 --- a/posixtest/test.go +++ b/posixtest/test.go @@ -9,7 +9,6 @@ import ( "bytes" "errors" "fmt" - "io/ioutil" "os" "path/filepath" "reflect" @@ -137,11 +136,11 @@ func FileBasic(t *testing.T, mnt string) { content := []byte("hello world") fn := mnt + "/file" - if err := ioutil.WriteFile(fn, content, 0755); err != nil { + if err := os.WriteFile(fn, content, 0755); err != nil { t.Fatalf("WriteFile: %v", err) } - if got, err := ioutil.ReadFile(fn); err != nil { + if got, err := os.ReadFile(fn); err != nil { t.Fatalf("ReadFile: %v", err) } else if bytes.Compare(got, content) != 0 { t.Errorf("ReadFile: got %q, want %q", got, content) @@ -174,7 +173,7 @@ func FileBasic(t *testing.T, mnt string) { func TruncateFile(t *testing.T, mnt string) { content := []byte("hello world") fn := mnt + "/file" - if err := ioutil.WriteFile(fn, content, 0755); err != nil { + if err := os.WriteFile(fn, content, 0755); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -193,7 +192,7 @@ func TruncateFile(t *testing.T, mnt string) { t.Errorf("Close: %v", err) } - if got, err := ioutil.ReadFile(fn); err != nil { + if got, err := os.ReadFile(fn); err != nil { t.Fatalf("ReadFile: %v", err) } else if want := content[:trunc]; bytes.Compare(got, want) != 0 { t.Errorf("got %q, want %q", got, want) @@ -201,7 +200,7 @@ func TruncateFile(t *testing.T, mnt string) { } func TruncateNoFile(t *testing.T, mnt string) { fn := mnt + "/file" - if err := ioutil.WriteFile(fn, []byte("hello"), 0644); err != nil { + if err := os.WriteFile(fn, []byte("hello"), 0644); err != nil { t.Errorf("WriteFile: %v", err) } @@ -220,12 +219,12 @@ func TruncateNoFile(t *testing.T, mnt string) { func FdLeak(t *testing.T, mnt string) { fn := mnt + "/file" - if err := ioutil.WriteFile(fn, []byte("hello world"), 0755); err != nil { + if err := os.WriteFile(fn, []byte("hello world"), 0755); err != nil { t.Fatalf("WriteFile: %v", err) } for i := 0; i < 100; i++ { - if _, err := ioutil.ReadFile(fn); err != nil { + if _, err := os.ReadFile(fn); err != nil { t.Fatalf("ReadFile: %v", err) } } @@ -259,11 +258,11 @@ func MkdirRmdir(t *testing.T, mnt string) { func NlinkZero(t *testing.T, mnt string) { src := mnt + "/src" dst := mnt + "/dst" - if err := ioutil.WriteFile(src, []byte("source"), 0644); err != nil { + if err := os.WriteFile(src, []byte("source"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } - if err := ioutil.WriteFile(dst, []byte("dst"), 0644); err != nil { + if err := os.WriteFile(dst, []byte("dst"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -307,7 +306,7 @@ func FstatDeleted(t *testing.T, mnt string) { // Create files with different sizes path := fmt.Sprintf("%s/%d", mnt, i) content := make([]byte, i) - err := ioutil.WriteFile(path, content, 0644) + err := os.WriteFile(path, content, 0644) if err != nil { t.Fatalf("WriteFile: %v", err) } @@ -350,7 +349,7 @@ func FstatDeleted(t *testing.T, mnt string) { func ParallelFileOpen(t *testing.T, mnt string) { fn := mnt + "/file" - if err := ioutil.WriteFile(fn, []byte("content"), 0644); err != nil { + if err := os.WriteFile(fn, []byte("content"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -384,7 +383,7 @@ func Link(t *testing.T, mnt string) { link := mnt + "/link" target := mnt + "/target" - if err := ioutil.WriteFile(target, []byte("hello"), 0644); err != nil { + if err := os.WriteFile(target, []byte("hello"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -423,12 +422,12 @@ func RenameOverwrite(t *testing.T, mnt string, destExists bool) { if err := os.Mkdir(mnt+"/dir", 0755); err != nil { t.Fatalf("Mkdir: %v", err) } - if err := ioutil.WriteFile(mnt+"/file", []byte("hello"), 0644); err != nil { + if err := os.WriteFile(mnt+"/file", []byte("hello"), 0644); err != nil { t.Fatalf("WriteFile: %v", err) } if destExists { - if err := ioutil.WriteFile(mnt+"/dir/renamed", []byte("xx"), 0644); err != nil { + if err := os.WriteFile(mnt+"/dir/renamed", []byte("xx"), 0644); err != nil { t.Fatalf("WriteFile dest: %v", err) } } @@ -525,7 +524,7 @@ func ReadDir(t *testing.T, mnt string) { for i := 0; i < 110; i++ { nm := fmt.Sprintf("file%036x", i) want[nm] = true - if err := ioutil.WriteFile(filepath.Join(mnt, nm), []byte("hello"), 0644); err != nil { + if err := os.WriteFile(filepath.Join(mnt, nm), []byte("hello"), 0644); err != nil { t.Fatalf("WriteFile %q: %v", nm, err) } // Verify that we get the expected entries @@ -583,7 +582,7 @@ func ReadDirConsistency(t *testing.T, mnt string) { func LinkUnlinkRename(t *testing.T, mnt string) { content := []byte("hello") tmp := mnt + "/tmpfile" - if err := ioutil.WriteFile(tmp, content, 0644); err != nil { + if err := os.WriteFile(tmp, content, 0644); err != nil { t.Fatalf("WriteFile %q: %v", tmp, err) } @@ -595,7 +594,7 @@ func LinkUnlinkRename(t *testing.T, mnt string) { t.Fatalf("Unlink %q: %v", tmp, err) } - if back, err := ioutil.ReadFile(dest); err != nil { + if back, err := os.ReadFile(dest); err != nil { t.Fatalf("Read %q: %v", dest, err) } else if bytes.Compare(back, content) != 0 { t.Fatalf("Read got %q want %q", back, content) @@ -627,7 +626,7 @@ func AppendWrite(t *testing.T, mnt string) { fd = 0 want := []byte("helloworld") - got, err := ioutil.ReadFile(mnt + "/file") + got, err := os.ReadFile(mnt + "/file") if err != nil { t.Fatalf("ReadFile: %v", err) } @@ -754,7 +753,7 @@ func FcntlFlockLocksFile(t *testing.T, mnt string) { func LseekHoleSeeksToEOF(t *testing.T, mnt string) { fn := filepath.Join(mnt, "file.bin") content := bytes.Repeat([]byte("abcxyz\n"), 1024) - if err := ioutil.WriteFile(fn, content, 0644); err != nil { + if err := os.WriteFile(fn, content, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } @@ -775,7 +774,7 @@ func LseekHoleSeeksToEOF(t *testing.T, mnt string) { func LseekEnxioCheck(t *testing.T, mnt string) { fn := filepath.Join(mnt, "file.bin") content := bytes.Repeat([]byte("abcxyz\n"), 1024) - if err := ioutil.WriteFile(fn, content, 0644); err != nil { + if err := os.WriteFile(fn, content, 0644); err != nil { t.Fatalf("WriteFile: %v", err) } diff --git a/posixtest/xfstests.go b/posixtest/xfstests.go index 639c32dc5..7529b8417 100644 --- a/posixtest/xfstests.go +++ b/posixtest/xfstests.go @@ -6,7 +6,6 @@ package posixtest import ( "fmt" - "io/ioutil" "os" "reflect" "syscall" @@ -32,7 +31,7 @@ func DirSeek(t *testing.T, mnt string) { } for i := 1; i <= 168; i++ { path := fmt.Sprintf("%s/%d", ttt, i) - err = ioutil.WriteFile(path, nil, 0600) + err = os.WriteFile(path, nil, 0600) if err != nil { t.Fatal(err) } diff --git a/splice/copy_test.go b/splice/copy_test.go index ede2ab3a4..812a54785 100644 --- a/splice/copy_test.go +++ b/splice/copy_test.go @@ -7,7 +7,6 @@ package splice import ( - "io/ioutil" "os" "testing" ) @@ -19,18 +18,18 @@ func check(err error) { } func TestCopyFile(t *testing.T) { - src, _ := ioutil.TempFile("", "termite") - err := ioutil.WriteFile(src.Name(), []byte("hello"), 0644) + src, _ := os.CreateTemp("", "termite") + err := os.WriteFile(src.Name(), []byte("hello"), 0644) if err != nil { t.Error(err) } - dst, _ := ioutil.TempFile("", "termite") + dst, _ := os.CreateTemp("", "termite") err = CopyFile(dst.Name(), src.Name(), 0755) if err != nil { t.Error(err) } - c, err := ioutil.ReadFile(dst.Name()) + c, err := os.ReadFile(dst.Name()) if err != nil { t.Error(err) } @@ -40,7 +39,7 @@ func TestCopyFile(t *testing.T) { } func TestSpliceCopy(t *testing.T) { - src, err := ioutil.TempFile("", "termite") + src, err := os.CreateTemp("", "termite") check(err) bs := make([]byte, 2*1024*1024) for i := range bs { @@ -52,7 +51,7 @@ func TestSpliceCopy(t *testing.T) { check(err) src, err = os.Open(src.Name()) check(err) - dst, err := ioutil.TempFile("", "termite") + dst, err := os.CreateTemp("", "termite") check(err) if maxPipeSize%4096 != 0 || maxPipeSize < 4096 { diff --git a/splice/splice.go b/splice/splice.go index 14f1a880b..9ec14b5f5 100644 --- a/splice/splice.go +++ b/splice/splice.go @@ -10,7 +10,6 @@ package splice import ( "fmt" - "io/ioutil" "log" "os" "sync" @@ -39,7 +38,7 @@ var ( ) func init() { - content, err := ioutil.ReadFile("/proc/sys/fs/pipe-max-size") + content, err := os.ReadFile("/proc/sys/fs/pipe-max-size") if err != nil { maxPipeSize = DefaultPipeSize } else { diff --git a/splice/splice_test.go b/splice/splice_test.go index 062a927fb..930e6ad4f 100644 --- a/splice/splice_test.go +++ b/splice/splice_test.go @@ -7,7 +7,7 @@ package splice import ( - "io/ioutil" + "os" "testing" ) @@ -21,8 +21,8 @@ func TestPairSize(t *testing.T) { b[i] = byte(i) } - f, _ := ioutil.TempFile("", "splice") - err := ioutil.WriteFile(f.Name(), b, 0644) + f, _ := os.CreateTemp("", "splice") + err := os.WriteFile(f.Name(), b, 0644) if err != nil { t.Fatalf("WriteFile: %v", err) } diff --git a/zipfs/multizip_test.go b/zipfs/multizip_test.go index f123574b4..654da78fd 100644 --- a/zipfs/multizip_test.go +++ b/zipfs/multizip_test.go @@ -5,7 +5,6 @@ package zipfs import ( - "io/ioutil" "os" "testing" "time" @@ -58,7 +57,7 @@ func TestMultiZipFs(t *testing.T) { zipFile := testZipFile() - entries, err := ioutil.ReadDir(mountPoint) + entries, err := os.ReadDir(mountPoint) if err != nil { t.Fatalf("ReadDir failed: %v", err) } @@ -76,7 +75,7 @@ func TestMultiZipFs(t *testing.T) { t.Errorf("Expect directory at /zipmount") } - entries, err = ioutil.ReadDir(mountPoint) + entries, err = os.ReadDir(mountPoint) if err != nil { t.Fatalf("ReadDir failed: %v", err) } @@ -122,7 +121,7 @@ func TestMultiZipFs(t *testing.T) { t.Errorf("stat should fail after unmount, got %#v", fi) } } else { - entries, err = ioutil.ReadDir(mountPoint) + entries, err = os.ReadDir(mountPoint) if err != nil { t.Fatalf("ReadDir failed: %v", err) } diff --git a/zipfs/tarfs_test.go b/zipfs/tarfs_test.go index 7391e9e11..e9c1998a7 100644 --- a/zipfs/tarfs_test.go +++ b/zipfs/tarfs_test.go @@ -8,7 +8,6 @@ import ( "archive/tar" "bytes" "io" - "io/ioutil" "os" "path/filepath" "strings" @@ -103,7 +102,7 @@ func TestTar(t *testing.T) { t.Errorf("entry %q, got mode %o, want %o", k, got, want) } - c, err := ioutil.ReadFile(p) + c, err := os.ReadFile(p) if err != nil { t.Errorf("read %q: %v", k, err) got := string(c) diff --git a/zipfs/zipfs.go b/zipfs/zipfs.go index 6115eef7b..42935fc3d 100644 --- a/zipfs/zipfs.go +++ b/zipfs/zipfs.go @@ -8,7 +8,7 @@ import ( "archive/zip" "context" "fmt" - "io/ioutil" + "io" "os" "path/filepath" "strings" @@ -99,7 +99,7 @@ func (zf *zipFile) Open(ctx context.Context, flags uint32) (fs.FileHandle, uint3 if err != nil { return nil, 0, syscall.EIO } - content, err := ioutil.ReadAll(rc) + content, err := io.ReadAll(rc) if err != nil { return nil, 0, syscall.EIO } diff --git a/zipfs/zipfs_test.go b/zipfs/zipfs_test.go index 8a229b1fd..c9458e34b 100644 --- a/zipfs/zipfs_test.go +++ b/zipfs/zipfs_test.go @@ -5,7 +5,6 @@ package zipfs import ( - "io/ioutil" "os" "path/filepath" "runtime" @@ -46,7 +45,8 @@ func setupZipfs(t *testing.T) (mountPoint string, cleanup func()) { func TestZipFs(t *testing.T) { mountPoint, clean := setupZipfs(t) defer clean() - entries, err := ioutil.ReadDir(mountPoint) + entries, err := os.ReadDir(mountPoint) + if err != nil { t.Fatalf("ReadDir failed: %v", err) }