From f7f14cf8c9612bd0da48ec0313c648f9ad23b2ee Mon Sep 17 00:00:00 2001 From: Garry McNulty Date: Sun, 28 Apr 2019 20:55:31 +0100 Subject: [PATCH] fs: Add file info base name check in reader tests (#2063) --- internal/fs/fs_reader_test.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/fs/fs_reader_test.go b/internal/fs/fs_reader_test.go index e5de286bb..6d7bf4df3 100644 --- a/internal/fs/fs_reader_test.go +++ b/internal/fs/fs_reader_test.go @@ -4,6 +4,7 @@ import ( "bytes" "io/ioutil" "os" + "path" "sort" "strings" "testing" @@ -163,8 +164,12 @@ func checkFileInfo(t testing.TB, fi os.FileInfo, filename string, modtime time.T t.Errorf("ModTime() returned wrong value, want %v, got %v", modtime, fi.ModTime()) } - if fi.Name() != filename { - t.Errorf("Name() returned wrong value, want %q, got %q", filename, fi.Name()) + if path.Base(fi.Name()) != fi.Name() { + t.Errorf("Name() returned is not base, want %q, got %q", path.Base(fi.Name()), fi.Name()) + } + + if fi.Name() != path.Base(filename) { + t.Errorf("Name() returned wrong value, want %q, got %q", path.Base(filename), fi.Name()) } }