From 7d15f4826c85561de48de3d436b9157a783b53e5 Mon Sep 17 00:00:00 2001 From: Bill Sager Date: Tue, 17 Dec 2024 15:58:24 -0800 Subject: [PATCH] trial fix for CI differences --- internal/interpreters/r_test.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/internal/interpreters/r_test.go b/internal/interpreters/r_test.go index 82bab8e6c..0abb27567 100644 --- a/internal/interpreters/r_test.go +++ b/internal/interpreters/r_test.go @@ -170,6 +170,10 @@ https://www.gnu.org/licenses/.`, } func (s *RSuite) TestGetRVersionFromExecutable() { + if runtime.GOOS == "windows" { + s.T().Skip("This test does not run on Windows") + } + for _, tc := range getOutputTestData() { s.SetupTest() log := logging.New() @@ -205,6 +209,9 @@ func (s *RSuite) TestGetRVersionFromExecutable() { } func (s *RSuite) TestGetRVersionFromExecutableWindows() { + if runtime.GOOS != "windows" { + s.T().Skip("This test only runs on Windows") + } // R on Windows emits version information on stderr for _, tc := range getOutputTestData() { s.SetupTest() @@ -233,7 +240,10 @@ func (s *RSuite) TestGetRVersionFromExecutableWindows() { lockFile, _, err := rInterpreter.GetLockFilePath() s.NoError(err) - s.Equal(tc.expectedLockfilePath, lockFile.String()) + absLockFile := util.NewAbsolutePath(lockFile.String(), s.fs) + absExpectedLockFile := util.NewAbsolutePath(tc.expectedLockfilePath, s.fs) + + s.Equal(absExpectedLockFile.String(), absLockFile.String()) } }