Skip to content

Commit 29b49f0

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1292 from alanconway/remove-ginkgo-junit
LOG-2117 Remove deprecated Ginkgo custom reporters
2 parents 3d1aa40 + 3d31925 commit 29b49f0

File tree

12 files changed

+12
-60
lines changed

12 files changed

+12
-60
lines changed

‎test/e2e/collection/fluentd/fluentd_suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestFluentd(t *testing.T) {
1211
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")
1713
}

‎test/e2e/logforwarding/elasticsearchmanaged/logforwarding_suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestClusterLogForwarder(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogForwarder E2E Suite - Elasticsearch Managed"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-elasticsearch-managed.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogForwarder E2E Suite - Elasticsearch Managed")
1713
}

‎test/e2e/logforwarding/elasticsearchunmanaged/logforwarding_suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestClusterLogForwarder(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogForwarder E2E Suite - Elasticsearch Unmanaged"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-elasticsearch-unmanaged.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogForwarder E2E Suite - Elasticsearch Unmanaged")
1713
}

‎test/e2e/logforwarding/syslog/logforwarding_suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestClusterLogForwarder(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogForwarder E2E Suite - Syslog"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-syslog.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogForwarder E2E Suite - Syslog")
1713
}

‎test/framework/functional/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestSuite(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "[Framework][Functional] Suite"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-framework-functional.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "[Framework][Functional] Suite")
1713
}

‎test/functional/collection/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestLogForwarding(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "[Functional][Collection] Suite"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-collection.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "[Functional][Collection] Suite")
1713
}

‎test/functional/metrics/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestFunctionMetrics(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogging Functional Suite - SampleCollector"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-metrics.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogging Functional Suite - SampleCollector")
1713
}

‎test/functional/normalization/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestNormalization(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogging Functional Normalization Suite"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-normalization.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogging Functional Normalization Suite")
1713
}

‎test/functional/outputs/loki/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestFunctionalOutputs(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogging Functional Loki Output Suite"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-output.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogging Functional Loki Output Suite")
1713
}

‎test/functional/outputs/multiple/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestFunctionalOutputs(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "[Functional][Outputs][Multiple] Test Suite"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-outputs-multiple.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "[Functional][Outputs][Multiple] Test Suite")
1713
}

‎test/functional/outputs/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestFunctionalOutputs(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "ClusterLogging Functional Output Suite"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-functional-output.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "ClusterLogging Functional Output Suite")
1713
}

‎test/matchers/suite_test.go

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ import (
44
"testing"
55

66
. "github.com/onsi/ginkgo"
7-
"github.com/onsi/ginkgo/reporters"
87
. "github.com/onsi/gomega"
98
)
109

1110
func TestMatchers(t *testing.T) {
1211
RegisterFailHandler(Fail)
13-
14-
tc := "Matchers test"
15-
jr := reporters.NewJUnitReporter("/tmp/artifacts/junit/junit-matchers.xml")
16-
RunSpecsWithDefaultAndCustomReporters(t, tc, []Reporter{jr})
12+
RunSpecs(t, "Matchers test")
1713
}

0 commit comments

Comments
 (0)