github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 11:13:48 +00:00
Code Issues Projects Releases Wiki Activity

fix timeout for networking test

Browse Source
This commit is contained in:
Daniel Smith 2015-05-28 15:00:22 -07:00
parent 0e49e1535f
commit c8f03fc354
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/networking.go
View File

@ -112,9 +112,7 @@ var _ = Describe("NetworkingNew", func() {
}) })
//Now we can proceed with the test. //Now we can proceed with the test.
It("should function for intra-pod communication", func(done Done) { It("should function for intra-pod communication", func() {
defer close(done)
if testContext.Provider == "vagrant" { if testContext.Provider == "vagrant" {
By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)") By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return return
@ -203,7 +201,8 @@ var _ = Describe("NetworkingNew", func() {
DoRaw() DoRaw()
} }
for i := 0; !passed; i++ { // Timeout will keep us from going forever. timeout := time.Now().Add(2 * time.Minute)
for i := 0; !passed && timeout.After(time.Now()); i++ {
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()
@ -241,7 +240,7 @@ var _ = Describe("NetworkingNew", func() {
} }
} }
Expect(string(body)).To(Equal("pass")) Expect(string(body)).To(Equal("pass"))
}, 120) })
}) })
@ -326,9 +325,7 @@ var _ = Describe("Networking", func() {
}) })
//Now we can proceed with the test. //Now we can proceed with the test.
It("should function for intra-pod communication", func(done Done) { It("should function for intra-pod communication", func() {
defer close(done)
if testContext.Provider == "vagrant" { if testContext.Provider == "vagrant" {
By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)") By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return return
@ -417,7 +414,8 @@ var _ = Describe("Networking", func() {
DoRaw() DoRaw()
} }
for i := 0; !passed; i++ { // Timeout will keep us from going forever. timeout := time.Now().Add(2 * time.Minute)
for i := 0; !passed && timeout.After(time.Now()); i++ {
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()
@ -455,6 +453,6 @@ var _ = Describe("Networking", func() {
} }
} }
Expect(string(body)).To(Equal("pass")) Expect(string(body)).To(Equal("pass"))
}, 120) })
}) })