From 5a78c38d0e21bb6cfcc02703f25b9232b0312ccd Mon Sep 17 00:00:00 2001 From: David Bariod Date: Sun, 28 Oct 2018 18:12:32 +0100 Subject: [PATCH] make file name comparison os independant --- logrus_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/logrus_test.go b/logrus_test.go index 27cddaf..7c99825 100644 --- a/logrus_test.go +++ b/logrus_test.go @@ -5,6 +5,7 @@ import ( "encoding/json" "io/ioutil" "os" + "path/filepath" "sync" "testing" "time" @@ -347,7 +348,7 @@ func TestNestedLoggingReportsCorrectCaller(t *testing.T) { "github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"]) cwd, err := os.Getwd() require.NoError(t, err) - assert.Equal(t, cwd+"/logrus_test.go:339", fields["file"]) + assert.Equal(t, filepath.ToSlash(cwd+"/logrus_test.go:340"), filepath.ToSlash(fields["file"].(string))) buffer.Reset() @@ -376,7 +377,7 @@ func TestNestedLoggingReportsCorrectCaller(t *testing.T) { assert.Equal(t, "github.com/sirupsen/logrus_test.TestNestedLoggingReportsCorrectCaller", fields["func"]) require.NoError(t, err) - assert.Equal(t, cwd+"/logrus_test.go:364", fields["file"]) + assert.Equal(t, filepath.ToSlash(cwd+"/logrus_test.go:365"), filepath.ToSlash(fields["file"].(string))) logger.ReportCaller = false // return to default value }