Skip to content

Commit

Permalink
Merge pull request #1292 from alanconway/remove-ginkgo-junit
Browse files Browse the repository at this point in the history
LOG-2117 Remove deprecated Ginkgo custom reporters
  • Loading branch information
openshift-merge-robot authored Feb 24, 2022
2 parents 3d1aa40 + 3d31925 commit 29b49f0
Show file tree
Hide file tree
Showing 12 changed files with 12 additions and 60 deletions.
6 changes: 1 addition & 5 deletions test/e2e/collection/fluentd/fluentd_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/e2e/logforwarding/syslog/logforwarding_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/framework/functional/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/functional/collection/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/functional/metrics/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/functional/normalization/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/functional/outputs/loki/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/functional/outputs/multiple/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/functional/outputs/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
6 changes: 1 addition & 5 deletions test/matchers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

0 comments on commit 29b49f0

Please sign in to comment.