Skip to content
This repository was archived by the owner on Jul 11, 2023. It is now read-only.

e2e: fix ginkgo panic recoveries #3119

Merged
merged 1 commit into from
Apr 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/e2e/e2e_deployment_client_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ var _ = OSMDescribe("Test HTTP traffic from N deployment client -> 1 deployment

wg.Add(1)
go func(wg *sync.WaitGroup, srcClient string) {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(destApp, 200*time.Second, replicaSetPerService)).To(Succeed())
}(&wg, destApp)
Expand All @@ -95,6 +96,7 @@ var _ = OSMDescribe("Test HTTP traffic from N deployment client -> 1 deployment

wg.Add(1)
go func(wg *sync.WaitGroup, srcClient string) {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(srcClient, 200*time.Second, replicaSetPerService)).To(Succeed())
}(&wg, srcClient)
Expand Down
3 changes: 2 additions & 1 deletion tests/e2e/e2e_trafficsplit_recursive_split.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ var _ = OSMDescribe("Test traffic split where root service is same as backend se
})

func testRecursiveTrafficSplit(appProtocol string) {
defer GinkgoRecover()
const (
// to name the header we will use to identify the server that replies
HTTPHeaderName = "podname"
Expand Down Expand Up @@ -108,6 +107,7 @@ func testRecursiveTrafficSplit(appProtocol string) {

wg.Add(1)
go func() {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(serverNamespace, 200*time.Second, numberOfServerServices*serverReplicaSet)).To(Succeed())
}()
Expand All @@ -134,6 +134,7 @@ func testRecursiveTrafficSplit(appProtocol string) {

wg.Add(1)
go func(app string) {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(app, 200*time.Second, clientReplicaSet)).To(Succeed())
}(clientApp)
Expand Down
2 changes: 2 additions & 0 deletions tests/e2e/e2e_trafficsplit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func testTrafficSplit(appProtocol string) {
}
wg.Add(1)
go func() {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(serverNamespace, 200*time.Second, numberOfServerServices*serverReplicaSet)).To(Succeed())
}()
Expand All @@ -138,6 +139,7 @@ func testTrafficSplit(appProtocol string) {

wg.Add(1)
go func(app string) {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(app, 200*time.Second, clientReplicaSet)).To(Succeed())
}(clientApp)
Expand Down
2 changes: 2 additions & 0 deletions tests/framework/common_traffic.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"sync"

"github.com/fatih/color"
. "github.com/onsi/ginkgo"
)

const (
Expand Down Expand Up @@ -236,6 +237,7 @@ func (td *OsmTestData) MultipleHTTPRequest(requests *HTTPMultipleRequest) HTTPMu

wg.Add(1)
go func(ns string, podname string, htReq HTTPRequestDef) {
defer GinkgoRecover()
defer wg.Done()
r := td.HTTPRequest(htReq)

Expand Down
2 changes: 2 additions & 0 deletions tests/scale/scale_trafficSplit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ var _ = Describe("Scales a setup with client-servers and traffic splits til fail
}
wg.Add(1)
go func() {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(serverNamespace, 200*time.Second, numberOfServerServices*serverReplicaSet)).To(Succeed())
}()
Expand All @@ -148,6 +149,7 @@ var _ = Describe("Scales a setup with client-servers and traffic splits til fail

wg.Add(1)
go func(app string) {
defer GinkgoRecover()
defer wg.Done()
Expect(Td.WaitForPodsRunningReady(app, 200*time.Second, clientReplicaSet)).To(Succeed())
}(clientApp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ var _ = OSMDescribe("Reconcile MutatingWebhookConfiguration",
Expect(err).NotTo(HaveOccurred(), "failed to setup controller")

go func() {
defer GinkgoRecover()
err := mgr.Start(stopCh)
Expect(err).NotTo(HaveOccurred(), "failed to start manager")
}()
Expand Down