From 2b3ec21d4966ab95ef3b5547e16ed66436fcf870 Mon Sep 17 00:00:00 2001 From: Chris Koch Date: Thu, 11 Jan 2024 11:57:24 -0800 Subject: [PATCH] Use testing/fstest instead of memfs Signed-off-by: Chris Koch --- go.mod | 2 -- go.sum | 4 ---- uqemu/uqemu_test.go | 13 +++++++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 9c57a12..3f39fb5 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.18 require ( github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 github.com/creack/pty v1.1.21 - github.com/ncruces/go-fs v0.2.2 github.com/u-root/gobusybox/src v0.0.0-20231224233253-2944a440b6b6 github.com/u-root/u-root v0.11.1-0.20230807200058-f87ad7ccb594 github.com/u-root/uio v0.0.0-20230305220412-3e8cd9d6bf63 @@ -36,6 +35,5 @@ require ( github.com/vishvananda/netns v0.0.4 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.19.0 // indirect - golang.org/x/text v0.14.0 // indirect src.elv.sh v0.16.0-rc1.0.20220116211855-fda62502ad7f // indirect ) diff --git a/go.sum b/go.sum index 89b3570..7cde325 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,6 @@ github.com/mdlayher/packet v1.1.2 h1:3Up1NG6LZrsgDVn6X4L9Ge/iyRyxFEFD9o6Pr3Q1nQY github.com/mdlayher/packet v1.1.2/go.mod h1:GEu1+n9sG5VtiRE4SydOmX5GTwyyYlteZiFU+x0kew4= github.com/mdlayher/socket v0.5.0 h1:ilICZmJcQz70vrWVes1MFera4jGiWNocSkykwwoy3XI= github.com/mdlayher/socket v0.5.0/go.mod h1:WkcBFfvyG8QENs5+hfQPl1X6Jpd2yeLIYgrGFmJiJxI= -github.com/ncruces/go-fs v0.2.2 h1:ak7h7jdihotXtXqjrBb2YZViJ+n41tLIqMG9ZY7bJMQ= -github.com/ncruces/go-fs v0.2.2/go.mod h1:07xkoGj//ID8iICNv3rcD2PtMjia3mABv1yZzdq7qZ8= github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -120,8 +118,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= diff --git a/uqemu/uqemu_test.go b/uqemu/uqemu_test.go index f0d3801..d15c51f 100644 --- a/uqemu/uqemu_test.go +++ b/uqemu/uqemu_test.go @@ -17,12 +17,12 @@ import ( "strings" "sync" "testing" + "testing/fstest" "time" "github.com/hugelgupf/vmtest/qemu" "github.com/hugelgupf/vmtest/qemu/network" "github.com/hugelgupf/vmtest/tests/cmds/eventemitter/event" - "github.com/ncruces/go-fs/memfs" "github.com/u-root/u-root/pkg/ulog/ulogtest" "github.com/u-root/u-root/pkg/uroot" "golang.org/x/sys/unix" @@ -301,11 +301,16 @@ func TestKernelPanic(t *testing.T) { } func TestHTTPTask(t *testing.T) { - fs := memfs.Create() - _ = fs.Create("foobar", "text/plain", time.Now(), strings.NewReader("Hello, world!")) + fs := fstest.MapFS{ + "foobar": &fstest.MapFile{ + Data: []byte("Hello, world!"), + Mode: 0o777, + ModTime: time.Now(), + }, + } // Serve HTTP on the host on a random port. - http.Handle("/", fs) + http.Handle("/", http.FileServer(http.FS(fs))) ln, err := net.Listen("tcp", ":0") if err != nil { t.Fatal(err)