Merge pull request #1191 from timstclair/e2e-errors

tallclair · tallclair · commit de1bd289cbea · 2016-04-05T16:08:29.000-07:00
Don't escape e2e test command output in error messages
diff --git a/integration/runner/runner.go b/integration/runner/runner.go
@@ -75,7 +75,7 @@ func getAttributes(ipAddress, portStr string) (*cadvisorApi.Attributes, error) {
 func RunCommand(cmd string, args ...string) error {
 	output, err := exec.Command(cmd, args...).CombinedOutput()
 	if err != nil {
-		return fmt.Errorf("command %q %q failed with error: %v and output: %q", cmd, args, err, output)
+		return fmt.Errorf("command %q %q failed with error: %v and output: %v", cmd, args, err, output)
 	}
 
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func getAttributes(ipAddress, portStr string) (*cadvisorApi.Attributes, error) {`
`75`	`75`	`func RunCommand(cmd string, args ...string) error {`
`76`	`76`	`output, err := exec.Command(cmd, args...).CombinedOutput()`
`77`	`77`	`if err != nil {`
`78`		`- return fmt.Errorf("command %q %q failed with error: %v and output: %q", cmd, args, err, output)`
	`78`	`+ return fmt.Errorf("command %q %q failed with error: %v and output: %v", cmd, args, err, output)`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`return nil`