github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2017-05-30 04:46:04 -07:00 committed by GitHub
commit 38b26db33a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/framework/service_util.go
View File

@ -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