Merge pull request #4692 from kersten/chore/test-context

k8s-ci-robot · web-flow · commit b01bdc67a01c · 2025-03-27T11:24:42.000-07:00
🌱 (chore): wrap error with %w in test_context.go for improved diagnostics
diff --git a/test/e2e/utils/test_context.go b/test/e2e/utils/test_context.go
@@ -307,7 +307,7 @@ func (cc *CmdContext) Run(cmd *exec.Cmd) ([]byte, error) {
 	_, _ = fmt.Fprintf(GinkgoWriter, "running: %s\n", command)
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return output, fmt.Errorf("%s failed with error: (%v) %s", command, err, string(output))
+		return output, fmt.Errorf("%q failed with error %q: %w", command, string(output), err)
 	}
 
 	return output, nil

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ func (cc CmdContext) Run(cmd exec.Cmd) ([]byte, error) {`
`307`	`307`	`_, _ = fmt.Fprintf(GinkgoWriter, "running: %s\n", command)`
`308`	`308`	`output, err := cmd.CombinedOutput()`
`309`	`309`	`if err != nil {`
`310`		`- return output, fmt.Errorf("%s failed with error: (%v) %s", command, err, string(output))`
	`310`	`+ return output, fmt.Errorf("%q failed with error %q: %w", command, string(output), err)`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`return output, nil`