From d59cc8b6cd7097d30ace466a88e0ef9c033becb5 Mon Sep 17 00:00:00 2001 From: Mark Sagi-Kazar Date: Tue, 4 Jun 2024 15:47:35 +0200 Subject: [PATCH] test: fix tests on windows Signed-off-by: Mark Sagi-Kazar --- file.go | 2 ++ viper_test.go | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/file.go b/file.go index d52f018..50a4058 100644 --- a/file.go +++ b/file.go @@ -53,6 +53,8 @@ func (v *Viper) findConfigFileWithFinder(finder Finder) (string, error) { return "", ConfigFileNotFoundError{v.configName, fmt.Sprintf("%s", v.configPaths)} } + // We call clean on the final result to ensure that the path is in its canonical form. + // This is mostly for consistent path handling and to make sure tests pass. return results[0], nil } diff --git a/viper_test.go b/viper_test.go index 8a52dc1..a86f372 100644 --- a/viper_test.go +++ b/viper_test.go @@ -368,10 +368,10 @@ func TestGetConfigFile(t *testing.T) { t.Run("using a finder", func(t *testing.T) { fs := afero.NewMemMapFs() - err := fs.Mkdir(testutil.AbsFilePath(t, "/etc/viper"), 0o777) + err := fs.Mkdir("/etc/viper", 0o777) require.NoError(t, err) - _, err = fs.Create(testutil.AbsFilePath(t, "/etc/viper/config.yaml")) + _, err = fs.Create("/etc/viper/config.yaml") require.NoError(t, err) finder := locafero.Finder{ @@ -389,7 +389,7 @@ func TestGetConfigFile(t *testing.T) { v.SetConfigName("not-config") filename, err := v.getConfigFile() - assert.Equal(t, testutil.AbsFilePath(t, "/etc/viper/config.yaml"), filename) + assert.Equal(t, "/etc/viper/config.yaml", filename) assert.NoError(t, err) }) }