From 3d31925dbe5181f6fc7b1fffd5f51e646895ba5f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 6 Jan 2022 13:30:04 -0500 Subject: [PATCH] LOG-2117 Remove deprecated Ginkgo custom reporters --- test/e2e/collection/fluentd/fluentd_suite_test.go | 6 +----- .../elasticsearchmanaged/logforwarding_suite_test.go | 6 +----- .../elasticsearchunmanaged/logforwarding_suite_test.go | 6 +----- test/e2e/logforwarding/syslog/logforwarding_suite_test.go | 6 +----- test/framework/functional/suite_test.go | 6 +----- test/functional/collection/suite_test.go | 6 +----- test/functional/metrics/suite_test.go | 6 +----- test/functional/normalization/suite_test.go | 6 +----- test/functional/outputs/loki/suite_test.go | 6 +----- test/functional/outputs/multiple/suite_test.go | 6 +----- test/functional/outputs/suite_test.go | 6 +----- test/matchers/suite_test.go | 6 +----- 12 files changed, 12 insertions(+), 60 deletions(-) diff --git a/test/e2e/collection/fluentd/fluentd_suite_test.go b/test/e2e/collection/fluentd/fluentd_suite_test.go index 0751e66d05..0dc3d175d4 100644 --- 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 index 394effa46d..19a1e42487 100644 --- 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 index ad5d6ce242..b90cf85bf8 100644 --- 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 index 17f6852d50..923a2b8d73 100644 --- 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 index 7cf45151ea..9cb5be1716 100644 --- 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 index ab865c9931..f67f2c3aae 100644 --- 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 index 155140234b..68f9bba145 100644 --- 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 index c3dfb2b3b0..28af3cb51e 100644 --- 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 index dfdf0bb5cb..c90e2bfc0f 100644 --- 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 index ae32b69388..fb0bff0e14 100644 --- 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 index 9105edd825..7bb74f27ed 100644 --- 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 index d89cb82b25..edcdf152eb 100644 --- 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") }