github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup Fail calls in networking e2e test

Browse Source
This commit is contained in:
Satnam Singh 2015-03-20 11:00:24 -07:00
parent 7f02e110f4
commit bc58ac54e8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/networking.go
View File

@ -60,10 +60,10 @@ var _ = Describe("Networking", func() {
// Test basic external connectivity. // Test basic external connectivity.
resp, err := http.Get("http://google.com/") resp, err := http.Get("http://google.com/")
if err != nil { if err != nil {
Fail(fmt.Sprintf("unable to talk to the external internet: %v", err)) Failf("unable to talk to the external internet: %v", err)
} }
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
Fail(fmt.Sprintf("unexpected error code. expected 200, got: %v (%v)", resp.StatusCode, resp)) Failf("unexpected error code. expected 200, got: %v (%v)", resp.StatusCode, resp)
} }
name := "nettest" name := "nettest"
@ -85,14 +85,14 @@ var _ = Describe("Networking", func() {
}, },
}) })
if err != nil { if err != nil {
Fail(fmt.Sprintf("unable to create test service %s: %v", svc.Name, err)) Failf("unable to create test service %s: %v", svc.Name, err)
} }
// Clean up service // Clean up service
defer func() { defer func() {
defer GinkgoRecover() defer GinkgoRecover()
By("Cleaning up the service") By("Cleaning up the service")
if err = c.Services(ns).Delete(svc.Name); err != nil { if err = c.Services(ns).Delete(svc.Name); err != nil {
Fail(fmt.Sprintf("unable to delete svc %v: %v", svc.Name, err)) Failf("unable to delete svc %v: %v", svc.Name, err)
} }
}() }()
@ -175,9 +175,9 @@ var _ = Describe("Networking", func() {
Resource("services"). Resource("services").
Name(svc.Name).Suffix("read"). Name(svc.Name).Suffix("read").
Do().Raw(); err != nil { Do().Raw(); err != nil {
Fail(fmt.Sprintf("Failed on attempt %v. Cleaning up. Error reading details: %v", i, err)) Failf("Failed on attempt %v. Cleaning up. Error reading details: %v", i, err)
} else { } else {
Fail(fmt.Sprintf("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 break
} }
@ -191,9 +191,9 @@ var _ = Describe("Networking", func() {
Name(svc.Name). Name(svc.Name).
Suffix("read"). Suffix("read").
Do().Raw(); err != nil { Do().Raw(); err != nil {
Fail(fmt.Sprintf("Timed out. Cleaning up. Error reading details: %v", err)) Failf("Timed out. Cleaning up. Error reading details: %v", err)
} else { } else {
Fail(fmt.Sprintf("Timed out. Cleaning up. Details:\n%s", string(body))) Failf("Timed out. Cleaning up. Details:\n%s", string(body))
} }
} }
Expect(string(body)).To(Equal("pass")) Expect(string(body)).To(Equal("pass"))
@ -214,7 +214,7 @@ var _ = Describe("Networking", func() {
AbsPath(test.path). AbsPath(test.path).
Do().Raw() Do().Raw()
if err != nil { if err != nil {
Fail(fmt.Sprintf("Failed: %v\nBody: %s", err, string(data))) Failf("Failed: %v\nBody: %s", err, string(data))
} }
} }
}) })