Skip to content
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.

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

Fix failing fn-eval test #4156

Merged
merged 3 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ testType: eval
exitCode: 1
image: gcr.io/kpt-fn/set-namespace:v0.1.3
fnConfig: ../../config.yaml
stdErr: "wrong Node Kind for expected: MappingNode was ScalarNode: value: {I am not a valid config file}"
stdErr: "wrong node kind: expected MappingNode but got ScalarNode: node contents:\nI am not a valid config file\n"
4 changes: 3 additions & 1 deletion pkg/test/runner/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ func gitCommit(d, msg string) error {
}

func gitDiff(d, commit1, commit2 string) (string, error) {
stdout, stderr, err := runCommand(getCommand(d, "git", []string{"diff", commit1, commit2}))
command := getCommand(d, "git", []string{"diff", commit1, commit2})
command.Env = []string{"GIT_DIFF_OPTS="}
stdout, stderr, err := runCommand(command)
if err != nil {
return "", fmt.Errorf("git diff error: %w, output: %s, stderr: %s", err, stdout, stderr)
}
Expand Down
10 changes: 0 additions & 10 deletions porch/controllers/go.mod

This file was deleted.

Empty file removed porch/controllers/go.sum
Empty file.
9 changes: 0 additions & 9 deletions porch/go.mod

This file was deleted.

Empty file removed porch/go.sum
Empty file.
Loading