Skip to content

Commit 2d0e6cb

Browse files
committed
fix test
1 parent 2f7e94d commit 2d0e6cb

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

modules/assetfs/embed.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ type EmbeddedFile interface {
2727

2828
type EmbeddedFileInfo interface {
2929
fs.FileInfo
30+
fs.DirEntry
3031
GetGzipContent() ([]byte, bool)
3132
}
3233

@@ -143,13 +144,17 @@ func (e *embeddedFS) getFileInfo(fullName string) (*embeddedFileInfo, error) {
143144

144145
fields := strings.Split(fullName, "/")
145146
fi = e.meta().Root
147+
found := true
146148
for _, field := range fields {
147149
for _, child := range fi.Children {
148-
if child.BaseName == field {
150+
if found = child.BaseName == field; found {
149151
fi = child
150152
break
151153
}
152154
}
155+
if !found {
156+
return nil, fs.ErrNotExist
157+
}
153158
}
154159

155160
e.filesMu.Lock()
@@ -213,7 +218,7 @@ func (f *EmbeddedCompressedFile) Read(p []byte) (n int, err error) {
213218
func (f *EmbeddedFileBase) Seek(offset int64, whence int) (int64, error) {
214219
switch whence {
215220
case io.SeekStart:
216-
f.seekPos = 0 + offset
221+
f.seekPos = offset
217222
case io.SeekCurrent:
218223
f.seekPos += offset
219224
case io.SeekEnd:
@@ -234,8 +239,6 @@ func (f *EmbeddedCompressedFile) Close() error {
234239
return f.decompressor.Close()
235240
}
236241

237-
var _ fs.FileInfo = (*embeddedFileInfo)(nil)
238-
239242
func (fi *embeddedFileInfo) Name() string {
240243
return fi.BaseName
241244
}
@@ -252,8 +255,6 @@ func (fi *embeddedFileInfo) ModTime() time.Time {
252255
return fi.fs.meta().MaxModTime
253256
}
254257

255-
var _ fs.DirEntry = (*embeddedFileInfo)(nil)
256-
257258
func (fi *embeddedFileInfo) IsDir() bool {
258259
return fi.Children != nil
259260
}

modules/assetfs/embed_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ func TestEmbed(t *testing.T) {
2727
require.NoError(t, err)
2828
efs := NewEmbeddedFS(data)
2929

30+
_, err = fs.ReadFile(efs, "not exist")
31+
assert.ErrorIs(t, err, fs.ErrNotExist)
32+
3033
content, err := fs.ReadFile(efs, "a.txt")
3134
require.NoError(t, err)
3235
assert.Equal(t, "a", string(content))

modules/zstd/zstd_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
)
1717

1818
func TestWriterReader(t *testing.T) {
19-
testData := prepareTestData(t, 20_000_000)
19+
testData := prepareTestData(t, 1_000_000)
2020

2121
result := bytes.NewBuffer(nil)
2222

@@ -64,7 +64,7 @@ func TestWriterReader(t *testing.T) {
6464
}
6565

6666
func TestSeekableWriterReader(t *testing.T) {
67-
testData := prepareTestData(t, 20_000_000)
67+
testData := prepareTestData(t, 2_000_000)
6868

6969
result := bytes.NewBuffer(nil)
7070

@@ -109,15 +109,15 @@ func TestSeekableWriterReader(t *testing.T) {
109109
reader, err := NewSeekableReader(assertReader)
110110
require.NoError(t, err)
111111

112-
_, err = reader.Seek(10_000_000, io.SeekStart)
112+
_, err = reader.Seek(1_000_000, io.SeekStart)
113113
require.NoError(t, err)
114114

115115
data := make([]byte, 1000)
116116
_, err = io.ReadFull(reader, data)
117117
require.NoError(t, err)
118118
require.NoError(t, reader.Close())
119119

120-
assert.Equal(t, testData[10_000_000:10_000_000+1000], data)
120+
assert.Equal(t, testData[1_000_000:1_000_000+1000], data)
121121

122122
// Should seek 3 times,
123123
// the first two times are for getting the index,

0 commit comments

Comments
 (0)