Merge pull request #41903 from justinsb/clearer_test_logging

Automatic merge from submit-queue

Clearer logging from e2e DialFromNode

I was a little confused by the messages previously.

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-08 15:42:53 -07:00 committed by GitHub
commit e6e382563b

View File

@ -256,12 +256,15 @@ func (config *NetworkingTestConfig) DialFromNode(protocol, targetIP string, targ
eps.Insert(trimmed)
}
}
Logf("Waiting for %+v endpoints, got endpoints %+v", expectedEps.Difference(eps), eps)
// Check against i+1 so we exit if minTries == maxTries.
if (eps.Equal(expectedEps) || eps.Len() == 0 && expectedEps.Len() == 0) && i+1 >= minTries {
if eps.Equal(expectedEps) && i+1 >= minTries {
Logf("Found all expected endpoints: %+v", eps.List())
return
}
Logf("Waiting for %+v endpoints (expected=%+v, actual=%+v)", expectedEps.Difference(eps).List(), expectedEps.List(), eps.List())
// TODO: get rid of this delay #36281
time.Sleep(hitEndpointRetryDelay)
}