Remove dependency of deprecated ioutil package
This commit is contained in:
Vendored
+5
-6
@@ -3,7 +3,6 @@ package cache
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@@ -22,7 +21,7 @@ func callNewFileCache(name, cacheSize, cacheFolder string, maxItems int, getRead
|
||||
|
||||
var _ = Describe("File Caches", func() {
|
||||
BeforeEach(func() {
|
||||
conf.Server.DataFolder, _ = ioutil.TempDir("", "file_caches")
|
||||
conf.Server.DataFolder, _ = os.MkdirTemp("", "file_caches")
|
||||
})
|
||||
AfterEach(func() {
|
||||
os.RemoveAll(conf.Server.DataFolder)
|
||||
@@ -61,13 +60,13 @@ var _ = Describe("File Caches", func() {
|
||||
Expect(err).To(BeNil())
|
||||
Expect(s.Cached).To(BeFalse())
|
||||
Expect(s.Closer).To(BeNil())
|
||||
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
|
||||
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
|
||||
|
||||
// Second call is a HIT
|
||||
called = false
|
||||
s, err = fc.Get(context.TODO(), &testArg{"test"})
|
||||
Expect(err).To(BeNil())
|
||||
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
|
||||
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
|
||||
Expect(s.Cached).To(BeTrue())
|
||||
Expect(s.Closer).ToNot(BeNil())
|
||||
Expect(called).To(BeFalse())
|
||||
@@ -83,13 +82,13 @@ var _ = Describe("File Caches", func() {
|
||||
s, err := fc.Get(context.TODO(), &testArg{"test"})
|
||||
Expect(err).To(BeNil())
|
||||
Expect(s.Cached).To(BeFalse())
|
||||
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
|
||||
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
|
||||
|
||||
// Second call is also a MISS
|
||||
called = false
|
||||
s, err = fc.Get(context.TODO(), &testArg{"test"})
|
||||
Expect(err).To(BeNil())
|
||||
Expect(ioutil.ReadAll(s)).To(Equal([]byte("test")))
|
||||
Expect(io.ReadAll(s)).To(Equal([]byte("test")))
|
||||
Expect(s.Cached).To(BeFalse())
|
||||
Expect(called).To(BeTrue())
|
||||
})
|
||||
|
||||
Vendored
+2
-3
@@ -1,7 +1,6 @@
|
||||
package cache
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
@@ -16,7 +15,7 @@ var _ = Describe("Spread FS", func() {
|
||||
|
||||
BeforeEach(func() {
|
||||
var err error
|
||||
rootDir, _ = ioutil.TempDir("", "spread_fs")
|
||||
rootDir, _ = os.MkdirTemp("", "spread_fs")
|
||||
fs, err = NewSpreadFS(rootDir, 0755)
|
||||
Expect(err).To(BeNil())
|
||||
})
|
||||
@@ -54,7 +53,7 @@ var _ = Describe("Spread FS", func() {
|
||||
var actual []string
|
||||
err := fs.Reload(func(key string, name string) {
|
||||
Expect(key).To(Equal(name))
|
||||
data, err := ioutil.ReadFile(name)
|
||||
data, err := os.ReadFile(name)
|
||||
Expect(err).To(BeNil())
|
||||
actual = append(actual, string(data))
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user