test/internal/testsuite: move fs checker

This also cleans up its API and improves error messages.

Signed-off-by: Ophestra <cat@gensokyo.uk>

3 files changed, 2 insertions, 184 deletions

diff --git a/test/internal/sandbox/assert.go b/test/internal/sandbox/assert.go
index e2bcc8ae..1194befb 100644
--- a/test/internal/sandbox/assert.go
+++ b/test/internal/sandbox/assert.go
@@ -33,7 +33,7 @@ func fatalf(format string, v ...any) { fatalfFunc(format, v...) }
 
 type TestCase struct {
 	Env     []string           `json:"env"`
-	FS      *FS                `json:"fs"`
+	FS      *testsuite.FS      `json:"fs"`
 	Mount   []*mountinfo.Entry `json:"mount"`
 	Seccomp bool               `json:"seccomp"`
 
@@ -110,7 +110,7 @@ func (t *T) MustCheck(want *TestCase) {
 	}
 
 	if want.FS != nil && t.FS != nil {
-		if err := want.FS.Compare(".", t.FS); err != nil {
+		if err := want.FS.Compare(printfFunc, ".", t.FS); err != nil {
 			fatalf("%v", err)
 		}
 	} else {
diff --git a/test/internal/sandbox/fs.go b/test/internal/sandbox/fs.go
deleted file mode 100644
index b37d30b9..00000000
--- a/test/internal/sandbox/fs.go
+++ /dev/null
@@ -1,102 +0,0 @@
-//go:build testtool
-
-package sandbox
-
-import (
-	"errors"
-	"fmt"
-	"io/fs"
-	"path/filepath"
-	"strings"
-)
-
-var (
-	ErrFSBadLength  = errors.New("bad dir length")
-	ErrFSBadData    = errors.New("data differs")
-	ErrFSBadMode    = errors.New("mode differs")
-	ErrFSInvalidEnt = errors.New("invalid entry condition")
-)
-
-type FS struct {
-	Mode fs.FileMode    `json:"mode"`
-	Dir  map[string]*FS `json:"dir"`
-	Data *string        `json:"data"`
-}
-
-func printDir(prefix string, dir []fs.DirEntry) {
-	names := make([]string, len(dir))
-	for i, ent := range dir {
-		name := ent.Name()
-		if ent.IsDir() {
-			name += "/"
-		}
-		names[i] = fmt.Sprintf("%q", name)
-	}
-	printf("[FAIL] d %s: %s", prefix, strings.Join(names, " "))
-}
-
-func (s *FS) Compare(prefix string, e fs.FS) error {
-	if s.Data != nil {
-		if s.Dir != nil {
-			panic("invalid state")
-		}
-		panic("invalid compare call")
-	}
-
-	if s.Dir == nil {
-		printf("[ OK ] s %s", prefix)
-		return nil
-	}
-
-	var dir []fs.DirEntry
-	if d, err := fs.ReadDir(e, prefix); err != nil {
-		return err
-	} else if len(d) != len(s.Dir) {
-		printDir(prefix, d)
-		return ErrFSBadLength
-	} else {
-		dir = d
-	}
-
-	for _, got := range dir {
-		name := got.Name()
-
-		if want, ok := s.Dir[name]; !ok {
-			printDir(prefix, dir)
-			return fs.ErrNotExist
-		} else if want.Dir != nil && !got.IsDir() {
-			printDir(prefix, dir)
-			return ErrFSInvalidEnt
-		} else {
-			name = filepath.Join(prefix, name)
-
-			if fi, err := got.Info(); err != nil {
-				return err
-			} else if fi.Mode() != want.Mode {
-				printf("[FAIL] m %s: %x, want %x",
-					name, uint32(fi.Mode()), uint32(want.Mode))
-				return ErrFSBadMode
-			}
-
-			if want.Data != nil {
-				if want.Dir != nil {
-					panic("invalid state")
-				}
-				if v, err := fs.ReadFile(e, name); err != nil {
-					return err
-				} else if string(v) != *want.Data {
-					printf("[FAIL] f %s", name)
-					printf("got:  %s", v)
-					printf("want: %s", *want.Data)
-					return ErrFSBadData
-				}
-				printf("[ OK ] f %s", name)
-			} else if err := want.Compare(name, e); err != nil {
-				return err
-			}
-		}
-	}
-	printf("[ OK ] d %s", prefix)
-
-	return nil
-}
diff --git a/test/internal/sandbox/fs_test.go b/test/internal/sandbox/fs_test.go
deleted file mode 100644
index a7813ee5..00000000
--- a/test/internal/sandbox/fs_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-//go:build testtool
-
-package sandbox_test
-
-import (
-	"errors"
-	"fmt"
-	"io/fs"
-	"strings"
-	"testing"
-	"testing/fstest"
-
-	"hakurei.app/test/internal/sandbox"
-)
-
-var (
-	fsPasswdSample = "u0_a20:x:65534:65534:Hakurei:/var/lib/persist/module/hakurei/u0/a20:/run/current-system/sw/bin/zsh"
-	fsGroupSample  = "hakurei:x:65534:"
-)
-
-func TestCompare(t *testing.T) {
-	testCases := []struct {
-		name string
-
-		sample  fstest.MapFS
-		want    *sandbox.FS
-		wantOut string
-		wantErr error
-	}{
-		{"skip", fstest.MapFS{}, &sandbox.FS{}, "[ OK ] s .\x00", nil},
-		{"simple pass", fstest.MapFS{".hakurei": {Mode: 0x800001ed}},
-			&sandbox.FS{Dir: map[string]*sandbox.FS{".hakurei": {Mode: 0x800001ed}}},
-			"[ OK ] s .hakurei\x00[ OK ] d .\x00", nil},
-		{"bad length", fstest.MapFS{".hakurei": {Mode: 0x800001ed}},
-			&sandbox.FS{Dir: make(map[string]*sandbox.FS)},
-			"[FAIL] d .: \".hakurei/\"\x00", sandbox.ErrFSBadLength},
-		{"top level bad mode", fstest.MapFS{".hakurei": {Mode: 0x800001ed}},
-			&sandbox.FS{Dir: map[string]*sandbox.FS{".hakurei": {Mode: 0xdeadbeef}}},
-			"[FAIL] m .hakurei: 800001ed, want deadbeef\x00", sandbox.ErrFSBadMode},
-		{"invalid entry condition", fstest.MapFS{"test": {Data: []byte{'0'}, Mode: 0644}},
-			&sandbox.FS{Dir: map[string]*sandbox.FS{"test": {Dir: make(map[string]*sandbox.FS)}}},
-			"[FAIL] d .: \"test\"\x00", sandbox.ErrFSInvalidEnt},
-		{"nonexistent", fstest.MapFS{"test": {Data: []byte{'0'}, Mode: 0644}},
-			&sandbox.FS{Dir: map[string]*sandbox.FS{".test": {}}},
-			"[FAIL] d .: \"test\"\x00", fs.ErrNotExist},
-		{"file", fstest.MapFS{"etc": {Mode: 0x800001c0},
-			"etc/passwd": {Data: []byte(fsPasswdSample), Mode: 0644},
-			"etc/group":  {Data: []byte(fsGroupSample), Mode: 0644},
-		}, &sandbox.FS{Dir: map[string]*sandbox.FS{"etc": {Mode: 0x800001c0, Dir: map[string]*sandbox.FS{
-			"passwd": {Mode: 0x1a4, Data: &fsPasswdSample},
-			"group":  {Mode: 0x1a4, Data: &fsGroupSample},
-		}}}}, "[ OK ] f etc/group\x00[ OK ] f etc/passwd\x00[ OK ] d etc\x00[ OK ] d .\x00", nil},
-		{"file differ", fstest.MapFS{"etc": {Mode: 0x800001c0},
-			"etc/passwd": {Data: []byte(fsPasswdSample), Mode: 0644},
-			"etc/group":  {Data: []byte(fsGroupSample), Mode: 0644},
-		}, &sandbox.FS{Dir: map[string]*sandbox.FS{"etc": {Mode: 0x800001c0, Dir: map[string]*sandbox.FS{
-			"passwd": {Mode: 0x1a4, Data: &fsGroupSample},
-			"group":  {Mode: 0x1a4, Data: &fsGroupSample},
-		}}}}, "[ OK ] f etc/group\x00[FAIL] f etc/passwd\x00got:  u0_a20:x:65534:65534:Hakurei:/var/lib/persist/module/hakurei/u0/a20:/run/current-system/sw/bin/zsh\x00want: hakurei:x:65534:\x00", sandbox.ErrFSBadData},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			gotOut := new(strings.Builder)
-			oldPrint := sandbox.SwapPrint(func(format string, v ...any) { _, _ = fmt.Fprintf(gotOut, format+"\x00", v...) })
-			t.Cleanup(func() { sandbox.SwapPrint(oldPrint) })
-
-			err := tc.want.Compare(".", tc.sample)
-			if !errors.Is(err, tc.wantErr) {
-				t.Errorf("Compare: error = %v; wantErr %v",
-					err, tc.wantErr)
-			}
-
-			if gotOut.String() != tc.wantOut {
-				t.Errorf("Compare: output %q; want %q",
-					gotOut, tc.wantOut)
-			}
-		})
-	}
-}