github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #14093 from lavalamp/removeGinkgoDefer 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-09-16 20:04:11 -07:00
parent 2da93a48b1 4d4bbab7de
commit 7a04c95bc5
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/networking.go
View File

@ -129,7 +129,6 @@ var _ = Describe("Networking", func() {
// Clean up service // Clean up service
defer func() { defer func() {
defer GinkgoRecover()
By("Cleaning up the service") By("Cleaning up the service")
if err = f.Client.Services(f.Namespace.Name).Delete(svc.Name); err != nil { if err = f.Client.Services(f.Namespace.Name).Delete(svc.Name); err != nil {
Failf("unable to delete svc %v: %v", svc.Name, err) Failf("unable to delete svc %v: %v", svc.Name, err)
@ -166,7 +165,6 @@ var _ = Describe("Networking", func() {
// Clean up the pods // Clean up the pods
defer func() { defer func() {
defer GinkgoRecover()
By("Cleaning up the webserver pods") By("Cleaning up the webserver pods")
for _, podName := range podNames { for _, podName := range podNames {
if err = f.Client.Pods(f.Namespace.Name).Delete(podName, nil); err != nil { if err = f.Client.Pods(f.Namespace.Name).Delete(podName, nil); err != nil {