Merge pull request #2100 from rzetelskik/drop-ginkgo-recover

Drop GinkgoRecover from ginkgo's container nodes
scylladb · Aug 29, 2024 · fe5d18c · fe5d18c
2 parents a677b2b + 3a7f474
commit fe5d18c
Show file tree

Hide file tree

Showing 22 changed files with 0 additions and 42 deletions.
diff --git a/test/e2e/set/nodeconfig/nodeconfig_disksetup.go b/test/e2e/set/nodeconfig/nodeconfig_disksetup.go
@@ -32,7 +32,6 @@ import (
 )
 
 var _ = g.Describe("Node Setup", framework.Serial, func() {
-	defer g.GinkgoRecover()
 	f := framework.NewFramework("nodesetup")
 
 	ncTemplate := scyllafixture.NodeConfig.ReadOrFail()

diff --git a/test/e2e/set/nodeconfig/nodeconfig_optimizations.go b/test/e2e/set/nodeconfig/nodeconfig_optimizations.go
@@ -32,8 +32,6 @@ const (
 // These tests modify global resource affecting global cluster state.
 // They must not be run asynchronously with other tests.
 var _ = g.Describe("NodeConfig Optimizations", framework.Serial, func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("nodeconfig")
 
 	ncTemplate := scyllafixture.NodeConfig.ReadOrFail()

diff --git a/test/e2e/set/scyllacluster/scyllacluster_alternator.go b/test/e2e/set/scyllacluster/scyllacluster_alternator.go
@@ -60,8 +60,6 @@ func (movie Movie) GetKey() map[string]types.AttributeValue {
 }
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should set up Alternator API when enabled", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_auth.go b/test/e2e/set/scyllacluster/scyllacluster_auth.go
@@ -22,8 +22,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster authentication", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("agent requires authentication", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_cleanup.go b/test/e2e/set/scyllacluster/scyllacluster_cleanup.go
@@ -22,8 +22,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("nodes are cleaned up after horizontal scaling", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_evictions.go b/test/e2e/set/scyllacluster/scyllacluster_evictions.go
@@ -15,8 +15,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster evictions", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should allow one disruption", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_expose.go b/test/e2e/set/scyllacluster/scyllacluster_expose.go
@@ -40,8 +40,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should connect to cluster via Ingresses", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_external_seeds.go b/test/e2e/set/scyllacluster/scyllacluster_external_seeds.go
@@ -16,8 +16,6 @@ import (
 )
 
 var _ = g.Describe("MultiDC cluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should form when external seeds are provided to ScyllaClusters", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_hostid.go b/test/e2e/set/scyllacluster/scyllacluster_hostid.go
@@ -15,8 +15,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster HostID", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should be reflected as a Service annotation", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_rebootstrap.go b/test/e2e/set/scyllacluster/scyllacluster_rebootstrap.go
@@ -18,7 +18,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
 
 	f := framework.NewFramework("scyllacluster")
 

diff --git a/test/e2e/set/scyllacluster/scyllacluster_replace.go b/test/e2e/set/scyllacluster/scyllacluster_replace.go
@@ -20,8 +20,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	const (

diff --git a/test/e2e/set/scyllacluster/scyllacluster_sa.go b/test/e2e/set/scyllacluster/scyllacluster_sa.go
@@ -19,8 +19,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should claim preexisting member ServiceAccount and RoleBinding", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_scaling.go b/test/e2e/set/scyllacluster/scyllacluster_scaling.go
@@ -19,8 +19,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should support scaling", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_shardawareness.go b/test/e2e/set/scyllacluster/scyllacluster_shardawareness.go
@@ -24,8 +24,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should allow to build connection pool using shard aware ports", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_sysctl.go b/test/e2e/set/scyllacluster/scyllacluster_sysctl.go
@@ -17,8 +17,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster sysctl", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should set container sysctl", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_tls.go b/test/e2e/set/scyllacluster/scyllacluster_tls.go
@@ -35,8 +35,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should setup and maintain up to date TLS certificates", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_updates.go b/test/e2e/set/scyllacluster/scyllacluster_updates.go
@@ -29,8 +29,6 @@ func addQuantity(lhs resource.Quantity, rhs resource.Quantity) *resource.Quantit
 }
 
 var _ = g.Describe("ScyllaCluster", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should rolling restart cluster when forceRedeploymentReason is changed", func() {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_upgrades.go b/test/e2e/set/scyllacluster/scyllacluster_upgrades.go
@@ -17,8 +17,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster upgrades", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	type entry struct {

diff --git a/test/e2e/set/scyllacluster/scyllacluster_webhooks.go b/test/e2e/set/scyllacluster/scyllacluster_webhooks.go
@@ -19,8 +19,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaCluster webhook", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should forbid invalid requests", func() {

diff --git a/test/e2e/set/scyllacluster/scyllamanager.go b/test/e2e/set/scyllacluster/scyllamanager.go
@@ -21,8 +21,6 @@ import (
 )
 
 var _ = g.Describe("Scylla Manager integration", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	g.It("should register cluster and sync repair tasks", func() {

diff --git a/test/e2e/set/scyllacluster/scyllamanager_object_storage.go b/test/e2e/set/scyllacluster/scyllamanager_object_storage.go
@@ -28,8 +28,6 @@ import (
 )
 
 var _ = g.Describe("Scylla Manager integration", framework.RequiresObjectStorage, func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scyllacluster")
 
 	type entry struct {

diff --git a/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go b/test/e2e/set/scylladbmonitoring/scylladbmonitoring.go
@@ -27,8 +27,6 @@ import (
 )
 
 var _ = g.Describe("ScyllaDBMonitoring", func() {
-	defer g.GinkgoRecover()
-
 	f := framework.NewFramework("scylladbmonitoring")
 
 	g.It("should setup monitoring stack", func() {