Merge pull request #1292 from alanconway/remove-ginkgo-junit

openshift-merge-robot · web-flow · commit 29b49f08d6eb · 2022-02-23T23:09:30.000-05:00
LOG-2117 Remove deprecated Ginkgo custom reporters
diff --git a/test/e2e/collection/fluentd/fluentd_suite_test.go b/test/e2e/collection/fluentd/fluentd_suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestFluentd(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogging E2E Suite - Collection Fluentd"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-collection-fluentd.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogging E2E Suite - Collection Fluentd")
 }
diff --git a/test/e2e/logforwarding/elasticsearchmanaged/logforwarding_suite_test.go b/test/e2e/logforwarding/elasticsearchmanaged/logforwarding_suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestClusterLogForwarder(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogForwarder E2E Suite - Elasticsearch Managed"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-elasticsearch-managed.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogForwarder E2E Suite - Elasticsearch Managed")
 }
diff --git a/test/e2e/logforwarding/elasticsearchunmanaged/logforwarding_suite_test.go b/test/e2e/logforwarding/elasticsearchunmanaged/logforwarding_suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestClusterLogForwarder(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogForwarder E2E Suite - Elasticsearch Unmanaged"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-elasticsearch-unmanaged.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogForwarder E2E Suite - Elasticsearch Unmanaged")
 }
diff --git a/test/e2e/logforwarding/syslog/logforwarding_suite_test.go b/test/e2e/logforwarding/syslog/logforwarding_suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestClusterLogForwarder(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogForwarder E2E Suite - Syslog"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-syslog.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogForwarder E2E Suite - Syslog")
 }
diff --git a/test/framework/functional/suite_test.go b/test/framework/functional/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "[Framework][Functional] Suite"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-framework-functional.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "[Framework][Functional] Suite")
 }
diff --git a/test/functional/collection/suite_test.go b/test/functional/collection/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestLogForwarding(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "[Functional][Collection] Suite"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-collection.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "[Functional][Collection] Suite")
 }
diff --git a/test/functional/metrics/suite_test.go b/test/functional/metrics/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestFunctionMetrics(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogging Functional Suite - SampleCollector"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-metrics.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogging Functional Suite - SampleCollector")
 }
diff --git a/test/functional/normalization/suite_test.go b/test/functional/normalization/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestNormalization(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogging Functional Normalization Suite"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-normalization.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogging Functional Normalization Suite")
 }
diff --git a/test/functional/outputs/loki/suite_test.go b/test/functional/outputs/loki/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestFunctionalOutputs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogging Functional Loki Output Suite"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-output.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogging Functional Loki Output Suite")
 }
diff --git a/test/functional/outputs/multiple/suite_test.go b/test/functional/outputs/multiple/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestFunctionalOutputs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "[Functional][Outputs][Multiple] Test Suite"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-outputs-multiple.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "[Functional][Outputs][Multiple] Test Suite")
 }
diff --git a/test/functional/outputs/suite_test.go b/test/functional/outputs/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestFunctionalOutputs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "ClusterLogging Functional Output Suite"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-output.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "ClusterLogging Functional Output Suite")
 }
diff --git a/test/matchers/suite_test.go b/test/matchers/suite_test.go
@@ -4,14 +4,10 @@ import (
 	"testing"
 
 	. "github.com/onsi/ginkgo"
-	"github.com/onsi/ginkgo/reporters"
 	. "github.com/onsi/gomega"
 )
 
 func TestMatchers(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	tc := "Matchers test"
-	jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-matchers.xml")
-	RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
+	RunSpecs(t, "Matchers test")
 }

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,10 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`. "github.com/onsi/ginkgo"`
`7`		`- "github.com/onsi/ginkgo/reporters"`
`8`	`7`	`. "github.com/onsi/gomega"`
`9`	`8`	`)`
`10`	`9`
`11`	`10`	`func TestFluentd(t *testing.T) {`
`12`	`11`	`RegisterFailHandler(Fail)`
`13`		`-`
`14`		`- tc := "ClusterLogging E2E Suite - Collection Fluentd"`
`15`		`- jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-collection-fluentd.xml")`
`16`		`- RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})`
	`12`	`+ RunSpecs(t, "ClusterLogging E2E Suite - Collection Fluentd")`
`17`	`13`	`}`