Merge pull request #29110 from bboreham/clarify-healthcheck

Automatic merge from submit-queue Don't repeat the program name in healthCheckCommand.String() The name is in both `Path` and `Args[0]`, so start printing args at 1. Also refactor to avoid an extra space character in the output. I pondered whether `healthCheckCommand.String()` should check if the slice is empty, to avoid a panic, but it didn't check for `Cmd==nil` before. Fixes #29107

Merge pull request #29110 from bboreham/clarify-healthcheck
dca70739 · k8s-merge-robot · GitHub · 8c6336b1 · 0991c04b · dca70739
Commit dca70739 authored Jul 19, 2016 by k8s-merge-robot Committed by GitHub Jul 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

e2e_service.go test/e2e_node/e2e_service.go +1 -1

No files found.
--- a/test/e2e_node/e2e_service.go
+++ b/test/e2e_node/e2e_service.go
@@ -397,5 +397,5 @@ func newHealthCheckCommand(healthCheckUrl string, cmd *exec.Cmd, filename string
 }

 func (hcc *healthCheckCommand) String() string {
-	return fmt.Sprintf("`%s %s` health-check: %s", hcc.Path, strings.Join(hcc.Args, " "), hcc.HealthCheckUrl)
+	return fmt.Sprintf("`%s` health-check: %s", strings.Join(append([]string{hcc.Path}, hcc.Args[1:]...), " "), hcc.HealthCheckUrl)
 }