From 237f3739360f9f41d9e86eee0eeaac4353f3c58b Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Wed, 22 Sep 2021 11:18:45 +0200 Subject: [PATCH] test: fix finder tests on windows Signed-off-by: Mark Sagi-Kazar --- fs.go | 8 ++++---- fs_test.go | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs.go b/fs.go index 70631f8..5bdea1a 100644 --- a/fs.go +++ b/fs.go @@ -6,7 +6,7 @@ package viper import ( "errors" "io/fs" - "path/filepath" + "path" ) type finder struct { @@ -18,10 +18,10 @@ type finder struct { } func (f finder) Find(fsys fs.FS) (string, error) { - for _, path := range f.paths { + for _, searchPath := range f.paths { for _, fileName := range f.fileNames { for _, extension := range f.extensions { - filePath := filepath.Join(path, fileName+"."+extension) + filePath := path.Join(searchPath, fileName+"."+extension) ok, err := fileExists(fsys, filePath) if err != nil { @@ -34,7 +34,7 @@ func (f finder) Find(fsys fs.FS) (string, error) { } if f.withoutExtension { - filePath := filepath.Join(path, fileName) + filePath := path.Join(searchPath, fileName) ok, err := fileExists(fsys, filePath) if err != nil { diff --git a/fs_test.go b/fs_test.go index 73abd43..d811f45 100644 --- a/fs_test.go +++ b/fs_test.go @@ -13,8 +13,6 @@ import ( ) func TestFinder(t *testing.T) { - skipWindows(t) - t.Parallel() fsys := fstest.MapFS{