From 4ad97afdb3469da9808d3927455d74b13830dca0 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 19 Aug 2020 22:00:30 -0400
Subject: [PATCH] Add GinkgoRecover in goroutines

---
 test/e2e/annotations/limitconnections.go | 1 +
 test/e2e/framework/framework.go          | 1 +
 test/e2e/gracefulshutdown/shutdown.go    | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/test/e2e/annotations/limitconnections.go b/test/e2e/annotations/limitconnections.go
index 997042b3b..2274c574c 100644
--- a/test/e2e/annotations/limitconnections.go
+++ b/test/e2e/annotations/limitconnections.go
@@ -61,6 +61,7 @@ var _ = framework.DescribeAnnotation("Annotation - limit-connections", func() {
 
 		worker := func(wg *sync.WaitGroup) {
 			defer wg.Done()
+			defer ginkgo.GinkgoRecover()
 
 			resp := f.HTTPTestClient().
 				GET("/sleep/10").
diff --git a/test/e2e/framework/framework.go b/test/e2e/framework/framework.go
index 9c3c6e3fe..107dd6d66 100644
--- a/test/e2e/framework/framework.go
+++ b/test/e2e/framework/framework.go
@@ -115,6 +115,7 @@ func (f *Framework) BeforeEach() {
 func (f *Framework) AfterEach() {
 	defer func(kubeClient kubernetes.Interface, ns string) {
 		go func() {
+			defer ginkgo.GinkgoRecover()
 			err := deleteKubeNamespace(kubeClient, ns)
 			assert.Nil(ginkgo.GinkgoT(), err, "deleting namespace %v", f.Namespace)
 		}()
diff --git a/test/e2e/gracefulshutdown/shutdown.go b/test/e2e/gracefulshutdown/shutdown.go
index da298c5d0..629df46c0 100644
--- a/test/e2e/gracefulshutdown/shutdown.go
+++ b/test/e2e/gracefulshutdown/shutdown.go
@@ -88,6 +88,7 @@ var _ = framework.IngressNginxDescribe("[Shutdown] ingress controller", func() {
 
 		result := make(chan int)
 		go func() {
+			defer ginkgo.GinkgoRecover()
 			resp := f.HTTPTestClient().
 				GET("/sleep/70").
 				WithHeader("Host", host).
@@ -133,6 +134,7 @@ var _ = framework.IngressNginxDescribe("[Shutdown] ingress controller", func() {
 
 		result := make(chan int)
 		go func() {
+			defer ginkgo.GinkgoRecover()
 			resp := f.HTTPTestClient().
 				GET("/sleep/150").
 				WithHeader("Host", host).