Skip to content

Commit e40c71e

Browse files
committed
fix test
1 parent 2f7e94d commit e40c71e

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

modules/assetfs/embed.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,17 @@ func (e *embeddedFS) getFileInfo(fullName string) (*embeddedFileInfo, error) {
143143

144144
fields := strings.Split(fullName, "/")
145145
fi = e.meta().Root
146+
found := true
146147
for _, field := range fields {
147148
for _, child := range fi.Children {
148-
if child.BaseName == field {
149+
if found = child.BaseName == field; found {
149150
fi = child
150151
break
151152
}
152153
}
154+
if !found {
155+
return nil, fs.ErrNotExist
156+
}
153157
}
154158

155159
e.filesMu.Lock()
@@ -213,7 +217,7 @@ func (f *EmbeddedCompressedFile) Read(p []byte) (n int, err error) {
213217
func (f *EmbeddedFileBase) Seek(offset int64, whence int) (int64, error) {
214218
switch whence {
215219
case io.SeekStart:
216-
f.seekPos = 0 + offset
220+
f.seekPos = offset
217221
case io.SeekCurrent:
218222
f.seekPos += offset
219223
case io.SeekEnd:

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)