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

Remove unnecessary GinkgoDefer()s

Browse Source
This commit is contained in:
Zach Loafman 2015-02-11 16:42:08 -08:00
parent ac8e8cca78
commit 9774e9bb7b
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/pods.go
View File

@ -31,7 +31,6 @@ import (
) )
func runLivenessTest(c *client.Client, podDescr *api.Pod) { func runLivenessTest(c *client.Client, podDescr *api.Pod) {
defer GinkgoRecover()
ns := "e2e-test-" + string(util.NewUUID()) ns := "e2e-test-" + string(util.NewUUID())
By(fmt.Sprintf("Creating pod %s in namespace %s", podDescr.Name, ns)) By(fmt.Sprintf("Creating pod %s in namespace %s", podDescr.Name, ns))
@ -132,7 +131,6 @@ var _ = Describe("Pods", func() {
// We call defer here in case there is a problem with // We call defer here in case there is a problem with
// the test so we can ensure that we clean up after // the test so we can ensure that we clean up after
// ourselves // ourselves
defer GinkgoRecover()
podClient.Delete(pod.Name) podClient.Delete(pod.Name)
}() }()
@ -190,7 +188,6 @@ var _ = Describe("Pods", func() {
} }
defer func() { defer func() {
By("deleting the pod") By("deleting the pod")
defer GinkgoRecover()
podClient.Delete(pod.Name) podClient.Delete(pod.Name)
}() }()
@ -252,7 +249,6 @@ var _ = Describe("Pods", func() {
Fail(fmt.Sprintf("Failed to create serverPod: %v", err)) Fail(fmt.Sprintf("Failed to create serverPod: %v", err))
} }
defer func() { defer func() {
defer GinkgoRecover()
c.Pods(api.NamespaceDefault).Delete(serverPod.Name) c.Pods(api.NamespaceDefault).Delete(serverPod.Name)
}() }()
err = waitForPodRunning(c, serverPod.Name, 300*time.Second) err = waitForPodRunning(c, serverPod.Name, 300*time.Second)
@ -287,7 +283,6 @@ var _ = Describe("Pods", func() {
Fail(fmt.Sprintf("Failed to create service: %v", err)) Fail(fmt.Sprintf("Failed to create service: %v", err))
} }
defer func() { defer func() {
defer GinkgoRecover()
c.Services(api.NamespaceDefault).Delete(svc.Name) c.Services(api.NamespaceDefault).Delete(svc.Name)
}() }()
@ -318,7 +313,6 @@ var _ = Describe("Pods", func() {
Fail(fmt.Sprintf("Failed to create pod: %v", err)) Fail(fmt.Sprintf("Failed to create pod: %v", err))
} }
defer func() { defer func() {
defer GinkgoRecover()
c.Pods(api.NamespaceDefault).Delete(clientPod.Name) c.Pods(api.NamespaceDefault).Delete(clientPod.Name)
}() }()