From d097eaa28f3328c038e1b7003899f26dc0f12a4d Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 24 Mar 2025 16:03:53 +0900 Subject: [PATCH] test/sandbox: unquote fail messages Signed-off-by: Ophestra --- test/sandbox/fs.go | 4 ++-- test/sandbox/fs_test.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/sandbox/fs.go b/test/sandbox/fs.go index 68dcecf..2aa3aa5 100644 --- a/test/sandbox/fs.go +++ b/test/sandbox/fs.go @@ -30,7 +30,7 @@ func printDir(prefix string, dir []fs.DirEntry) { } names[i] = fmt.Sprintf("%q", name) } - printf("[FAIL] d %q: %s", prefix, strings.Join(names, " ")) + printf("[FAIL] d %s: %s", prefix, strings.Join(names, " ")) } func (s *FS) Compare(prefix string, e fs.FS) error { @@ -71,7 +71,7 @@ func (s *FS) Compare(prefix string, e fs.FS) error { if fi, err := got.Info(); err != nil { return err } else if fi.Mode() != want.Mode { - printf("[FAIL] m %q: %x, want %x", + printf("[FAIL] m %s: %x, want %x", name, uint32(fi.Mode()), uint32(want.Mode)) return ErrFSBadMode } diff --git a/test/sandbox/fs_test.go b/test/sandbox/fs_test.go index 2b122c5..cac5a3f 100644 --- a/test/sandbox/fs_test.go +++ b/test/sandbox/fs_test.go @@ -31,16 +31,16 @@ func TestCompare(t *testing.T) { "[ OK ] s .fortify\x00[ OK ] d .\x00", nil}, {"bad length", fstest.MapFS{".fortify": {Mode: 0x800001ed}}, &sandbox.FS{Dir: make(map[string]*sandbox.FS)}, - "[FAIL] d \".\": \".fortify/\"\x00", sandbox.ErrFSBadLength}, + "[FAIL] d .: \".fortify/\"\x00", sandbox.ErrFSBadLength}, {"top level bad mode", fstest.MapFS{".fortify": {Mode: 0x800001ed}}, &sandbox.FS{Dir: map[string]*sandbox.FS{".fortify": {Mode: 0xdeadbeef}}}, - "[FAIL] m \".fortify\": 800001ed, want deadbeef\x00", sandbox.ErrFSBadMode}, + "[FAIL] m .fortify: 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}, + "[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}, + "[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},