Skip to content

refactor(tests): resolve Windows compatibility issues in integration tests #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor(tests): resolve Windows compatibility issues in integration tests #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func TestIntegration(t *testing.T) {
name := strings.TrimSuffix(cfgPath, ".jsonnet")
t.Run(name, func(t *testing.T) {
// Parse the config.
cfg, err := config.ReadFile(cfgPath, filepath.Join("testdata", cfgPath))
cfg, err := config.ReadFile(cfgPath, cfgPath)
require.Nil(t, err)
pres, err := apply.FromConfig(cfg)
require.Nil(t, err)
Expand Down Expand Up @@ -108,15 +108,15 @@ func TestIntegration(t *testing.T) {
// Import.
b, err := os.ReadFile(name + ".json")
require.Nil(t, err)
assert.Equal(t, string(b), string(icfgJSON))
assert.Equal(t, normalizeLineEndings(string(b)), normalizeLineEndings(string(icfgJSON)))
// Diff.
b, err = os.ReadFile(name + ".diff")
require.Nil(t, err)
assert.Equal(t, string(b), d.String())
assert.Equal(t, normalizeLineEndings(string(b)), normalizeLineEndings(d.String()))
// Export
b, err = os.ReadFile(name + ".xml")
require.Nil(t, err)
assert.Equal(t, string(b), cfgxml.String())
assert.Equal(t, normalizeLineEndings(string(b)), normalizeLineEndings(cfgxml.String()))
})
}
}
Expand All @@ -129,7 +129,7 @@ func TestIntegrationImportExport(t *testing.T) {
name := strings.TrimSuffix(cfgPath, ".jsonnet")
t.Run(name, func(t *testing.T) {
// Parse the config.
cfg, err := config.ReadFile(cfgPath, filepath.Join("testdata", cfgPath))
cfg, err := config.ReadFile(cfgPath, cfgPath)
Copy link
Owner

@mbrt mbrt Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for this change?

require.Nil(t, err)
pres, err := apply.FromConfig(cfg)
require.Nil(t, err)
Expand Down Expand Up @@ -187,3 +187,8 @@ func mustParseTime(layout, value string) time.Time {
}
return t
}

// normalizeLineEndings converts CRLF to LF for cross-platform compatibility.
func normalizeLineEndings(s string) string {
return strings.ReplaceAll(s, "\r\n", "\n")
}
3 changes: 1 addition & 2 deletions internal/engine/config/read.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"encoding/json"
"fmt"
"os"
"path"
"path/filepath"

"github.com/google/go-jsonnet"
Expand Down Expand Up @@ -54,7 +53,7 @@ func ReadJsonnet(p string, buf []byte) (v1alpha3.Config, error) {
var res v1alpha3.Config
vm := jsonnet.MakeVM()
vm.Importer(&jsonnet.FileImporter{
JPaths: []string{path.Dir(p)},
JPaths: []string{filepath.Dir(p)},
})
jstr, err := vm.EvaluateAnonymousSnippet(p, string(buf))
if err != nil {
Expand Down
1 change: 0 additions & 1 deletion testdata/valid/01-nodiff.jsonnet
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions testdata/valid/01-nodiff.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import "00-simple.jsonnet"