darkkirb/harness-drone
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(maint) fix starlark/jsonnet tests on windows

Browse source
This commit is contained in:
TP Honey 2022-06-14 11:39:28 +01:00
parent 086c4b3f82
commit 2a70ce51cc
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugin/converter/jsonnet/jsonnet_test.go
View file

@ -46,13 +46,19 @@ func TestParse(t *testing.T) {
req.Config.Data = string(before) req.Config.Data = string(before)
parsedFile, err := Parse(req, nil, 0, template, templateData) got, err := Parse(req, nil, 0, template, templateData)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
return return
} }
if want, got := parsedFile, string(after); want != got { want := string(after)
// on windows line endings are \r\n, lets change them to linux for comparison
if runtime.GOOS == "windows" {
want = strings.Replace(want, "\r\n", "\n", -1)
}
if want != got {
t.Errorf("Want %q got %q", want, got) t.Errorf("Want %q got %q", want, got)
} }
} }

11
plugin/converter/starlark_test.go
View file

@ -16,6 +16,8 @@ package converter
import ( import (
"io/ioutil" "io/ioutil"
"runtime"
"strings"
"testing" "testing"
"github.com/drone/drone/core" "github.com/drone/drone/core"
@ -117,7 +119,14 @@ func TestConvert_Multi(t *testing.T) {
return return
} }
if want, got := config.Data, string(after); want != got { want := string(after)
// on windows line endings are \r\n, lets change them to linux for comparison
if runtime.GOOS == "windows" {
want = strings.Replace(want, "\r\n", "\n", -1)
}
got := config.Data
if want != got {
t.Errorf("Want %q got %q", want, got) t.Errorf("Want %q got %q", want, got)
} }
} }