Merge pull request #8601 from lavalamp/e2e-timeout

improve network test logging & add timeout - for debugging #8534
This commit is contained in:
Quinton Hoole 2015-05-20 17:25:52 -07:00
commit d3778f5f5a

View File

@ -200,12 +200,17 @@ var _ = Describe("Networking", func() {
By("Waiting for connectivity to be verified") By("Waiting for connectivity to be verified")
const maxAttempts = 60 const maxAttempts = 60
stopBy := time.Now().Add(2 * time.Minute)
passed := false passed := false
//once response OK, evaluate response body for pass/fail. //once response OK, evaluate response body for pass/fail.
var body []byte var body []byte
for i := 0; i < maxAttempts && !passed; i++ { for i := 0; i < maxAttempts && !passed; i++ {
if time.Now().After(stopBy) {
Logf("Timeout exceeded")
break
}
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
Logf("About to make a proxy status call") Logf("About to make a proxy status call")
start := time.Now() start := time.Now()
@ -226,10 +231,8 @@ var _ = Describe("Networking", func() {
case "pass": case "pass":
Logf("Passed on attempt %v. Cleaning up.", i) Logf("Passed on attempt %v. Cleaning up.", i)
passed = true passed = true
break
case "running": case "running":
Logf("Attempt %v/%v: test still running", i, maxAttempts) Logf("Attempt %v/%v: test still running", i, maxAttempts)
break
case "fail": case "fail":
if body, err = c.Get(). if body, err = c.Get().
Namespace(namespace.Name).Prefix("proxy"). Namespace(namespace.Name).Prefix("proxy").
@ -240,7 +243,8 @@ var _ = Describe("Networking", func() {
} else { } else {
Failf("Failed on attempt %v. Cleaning up. Details:\n%s", i, string(body)) Failf("Failed on attempt %v. Cleaning up. Details:\n%s", i, string(body))
} }
break default:
Logf("Unexpected response: %q", body)
} }
} }