Merge pull request #46613 from FengyunPan/fix-e2e-service

Automatic merge from submit-queue (batch tested with PRs 45534, 37212, 46613, 46350) [e2e]Fix define redundant parameter When timeout to reach HTTP service, redundant parameter make the error is nil.

Merge pull request #46613 from FengyunPan/fix-e2e-service
38b26db3 · Kubernetes Submit Queue · GitHub · 6ff83d12 · 38e8c32a · 38b26db3
Commit 38b26db3 authored May 30, 2017 by Kubernetes Submit Queue Committed by GitHub May 30, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

service_util.go test/e2e/framework/service_util.go +2 -1

No files found.
--- a/test/e2e/framework/service_util.go
+++ b/test/e2e/framework/service_util.go
@@ -716,7 +716,8 @@ func (j *ServiceTestJig) GetHTTPContent(host string, port int, timeout time.Dura
 	var body bytes.Buffer
 	var err error
 	if pollErr := wait.PollImmediate(Poll, timeout, func() (bool, error) {
-		result, err := TestReachableHTTPWithContent(host, port, url, "", &body)
+		var result bool
+		result, err = TestReachableHTTPWithContent(host, port, url, "", &body)
 		if err != nil {
 			Logf("Error hitting %v:%v%v, retrying: %v", host, port, url, err)
 			return false, nil