Skip to content

Commit 3d23f5b

Browse files
author
Adrian Cole
committed
fix scratch tests
Signed-off-by: Adrian Cole <[email protected]>
1 parent 7a31ea2 commit 3d23f5b

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

internal/syscallfs/syscallfs.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ type readFile interface {
143143
type file interface {
144144
readFile
145145
io.Writer
146-
io.WriterAt // for pwrite
147146
syncer
148147
}
149148

internal/syscallfs/syscallfs_bench_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
func BenchmarkReaderAtOffset(b *testing.B) {
1111
dirFS := os.DirFS("testdata")
12-
embedFS, err := fs.Sub(embedFS, "testdata")
12+
embedFS, err := fs.Sub(readerAtFS, "testdata")
1313
if err != nil {
1414
b.Fatal(err)
1515
}

internal/syscallfs/syscallfs_test.go

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,14 +261,30 @@ func requireErrno(t *testing.T, expected syscall.Errno, actual error) {
261261
require.True(t, errors.Is(actual, expected), "expected %v, but was %v", expected, actual)
262262
}
263263

264-
//go:embed testdata/wazero.txt
265-
var embedFS embed.FS
264+
var (
265+
//go:embed testdata/wazero.txt
266+
readerAtFS embed.FS
267+
readerAtFile = "wazero.txt"
268+
)
266269

267270
func TestReaderAtOffset(t *testing.T) {
268-
dirFS := os.DirFS("testdata")
269-
embedFS, err := fs.Sub(embedFS, "testdata")
271+
embedFS, err := fs.Sub(readerAtFS, "testdata")
272+
require.NoError(t, err)
273+
274+
d, err := embedFS.Open(readerAtFile)
270275
require.NoError(t, err)
271-
mapFS := fstest.MapFS{"wazero.txt": &fstest.MapFile{Data: []byte("wazero")}}
276+
defer d.Close()
277+
278+
bytes, err := io.ReadAll(d)
279+
require.NoError(t, err)
280+
281+
mapFS := fstest.MapFS{readerAtFile: &fstest.MapFile{Data: bytes}}
282+
283+
// Write a file as can't open "testdata" in scratch tests because they
284+
// can't read the original filesystem.
285+
tmpDir := t.TempDir()
286+
require.NoError(t, os.WriteFile(path.Join(tmpDir, readerAtFile), bytes, 0o0600))
287+
dirFS := os.DirFS(tmpDir)
272288

273289
tests := []struct {
274290
name string

0 commit comments

Comments
 (0)