From e0318c203f02ec3059ecb7ea6dfa156cb400681e Mon Sep 17 00:00:00 2001 From: Dave Chen Date: Wed, 1 Jun 2022 13:09:47 +0800 Subject: [PATCH] Remove `newlineReporter` custom report The `newlineReporter` intends to print a new line after the test to prevent the something print to the stdout and mess up the test result while cause the tool like `go-junit-report` fail to parse the result. But this is no longer needed based on following evidence. - The issue that was first introduced in `go-junit-report` has already fixed in the version referenced in `go.mod`. - The `newlineReporter` report doesn't fix anything for `Ginkgo` v1 or V2 or `go test`, it just prints a new line before the test summarization. Signed-off-by: Dave Chen Kubernetes-commit: 9953dde65dfaede9f1d481296053adc301ad9773 --- pkg/apply/parse/suite_test.go | 22 +------------------ pkg/apply/strategy/suite_test.go | 22 +------------------ pkg/apps/apps_suite_test.go | 22 +------------------ pkg/util/openapi/openapi_suite_test.go | 22 +------------------ .../validation/validation_suite_test.go | 22 +------------------ 5 files changed, 5 insertions(+), 105 deletions(-) diff --git a/pkg/apply/parse/suite_test.go b/pkg/apply/parse/suite_test.go index 010dc993..9e3f5df7 100644 --- a/pkg/apply/parse/suite_test.go +++ b/pkg/apply/parse/suite_test.go @@ -18,32 +18,12 @@ package parse_test import ( . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/config" - . "github.com/onsi/ginkgo/types" . "github.com/onsi/gomega" - "fmt" "testing" ) func TestApplyParse(t *testing.T) { RegisterFailHandler(Fail) - RunSpecsWithDefaultAndCustomReporters(t, "Apply Parse Suite", []Reporter{newlineReporter{}}) + RunSpecs(t, "Apply Parse Suite") } - -// Print a newline after the default newlineReporter due to issue -// https://github.com/jstemmer/go-junit-report/issues/31 -type newlineReporter struct{} - -func (newlineReporter) SpecSuiteWillBegin(config GinkgoConfigType, summary *SuiteSummary) {} - -func (newlineReporter) BeforeSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) AfterSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) SpecWillRun(specSummary *SpecSummary) {} - -func (newlineReporter) SpecDidComplete(specSummary *SpecSummary) {} - -// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:" -func (newlineReporter) SpecSuiteDidEnd(summary *SuiteSummary) { fmt.Printf("\n") } diff --git a/pkg/apply/strategy/suite_test.go b/pkg/apply/strategy/suite_test.go index 56202fbd..c2522380 100644 --- a/pkg/apply/strategy/suite_test.go +++ b/pkg/apply/strategy/suite_test.go @@ -18,32 +18,12 @@ package strategy_test import ( . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/config" - . "github.com/onsi/ginkgo/types" . "github.com/onsi/gomega" - "fmt" "testing" ) func TestStrategy(t *testing.T) { RegisterFailHandler(Fail) - RunSpecsWithDefaultAndCustomReporters(t, "Apply Strategy Suite", []Reporter{newlineReporter{}}) + RunSpecs(t, "Apply Strategy Suite") } - -// Print a newline after the default newlineReporter due to issue -// https://github.com/jstemmer/go-junit-report/issues/31 -type newlineReporter struct{} - -func (newlineReporter) SpecSuiteWillBegin(config GinkgoConfigType, summary *SuiteSummary) {} - -func (newlineReporter) BeforeSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) AfterSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) SpecWillRun(specSummary *SpecSummary) {} - -func (newlineReporter) SpecDidComplete(specSummary *SpecSummary) {} - -// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:" -func (newlineReporter) SpecSuiteDidEnd(summary *SuiteSummary) { fmt.Printf("\n") } diff --git a/pkg/apps/apps_suite_test.go b/pkg/apps/apps_suite_test.go index 86296f75..c6aa6987 100644 --- a/pkg/apps/apps_suite_test.go +++ b/pkg/apps/apps_suite_test.go @@ -18,32 +18,12 @@ package apps import ( . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/config" - . "github.com/onsi/ginkgo/types" . "github.com/onsi/gomega" - "fmt" "testing" ) func TestApps(t *testing.T) { RegisterFailHandler(Fail) - RunSpecsWithDefaultAndCustomReporters(t, "Apps Suite", []Reporter{newlineReporter{}}) + RunSpecs(t, "Apps Suite") } - -// Print a newline after the default newlineReporter due to issue -// https://github.com/jstemmer/go-junit-report/issues/31 -type newlineReporter struct{} - -func (newlineReporter) SpecSuiteWillBegin(config GinkgoConfigType, summary *SuiteSummary) {} - -func (newlineReporter) BeforeSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) AfterSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) SpecWillRun(specSummary *SpecSummary) {} - -func (newlineReporter) SpecDidComplete(specSummary *SpecSummary) {} - -// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:" -func (newlineReporter) SpecSuiteDidEnd(summary *SuiteSummary) { fmt.Printf("\n") } diff --git a/pkg/util/openapi/openapi_suite_test.go b/pkg/util/openapi/openapi_suite_test.go index 539e6c84..9201d4e6 100644 --- a/pkg/util/openapi/openapi_suite_test.go +++ b/pkg/util/openapi/openapi_suite_test.go @@ -18,32 +18,12 @@ package openapi_test import ( . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/config" - . "github.com/onsi/ginkgo/types" . "github.com/onsi/gomega" - "fmt" "testing" ) func TestOpenapi(t *testing.T) { RegisterFailHandler(Fail) - RunSpecsWithDefaultAndCustomReporters(t, "Openapi Suite", []Reporter{newlineReporter{}}) + RunSpecs(t, "Openapi Suite") } - -// Print a newline after the default newlineReporter due to issue -// https://github.com/jstemmer/go-junit-report/issues/31 -type newlineReporter struct{} - -func (newlineReporter) SpecSuiteWillBegin(config GinkgoConfigType, summary *SuiteSummary) {} - -func (newlineReporter) BeforeSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) AfterSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) SpecWillRun(specSummary *SpecSummary) {} - -func (newlineReporter) SpecDidComplete(specSummary *SpecSummary) {} - -// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:" -func (newlineReporter) SpecSuiteDidEnd(summary *SuiteSummary) { fmt.Printf("\n") } diff --git a/pkg/util/openapi/validation/validation_suite_test.go b/pkg/util/openapi/validation/validation_suite_test.go index f217ff29..feb39fa9 100644 --- a/pkg/util/openapi/validation/validation_suite_test.go +++ b/pkg/util/openapi/validation/validation_suite_test.go @@ -18,32 +18,12 @@ package validation import ( . "github.com/onsi/ginkgo" - . "github.com/onsi/ginkgo/config" - . "github.com/onsi/ginkgo/types" . "github.com/onsi/gomega" - "fmt" "testing" ) func TestOpenapiValidation(t *testing.T) { RegisterFailHandler(Fail) - RunSpecsWithDefaultAndCustomReporters(t, "Openapi Validation Suite", []Reporter{newlineReporter{}}) + RunSpecs(t, "Openapi Validation Suite") } - -// Print a newline after the default newlineReporter due to issue -// https://github.com/jstemmer/go-junit-report/issues/31 -type newlineReporter struct{} - -func (newlineReporter) SpecSuiteWillBegin(config GinkgoConfigType, summary *SuiteSummary) {} - -func (newlineReporter) BeforeSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) AfterSuiteDidRun(setupSummary *SetupSummary) {} - -func (newlineReporter) SpecWillRun(specSummary *SpecSummary) {} - -func (newlineReporter) SpecDidComplete(specSummary *SpecSummary) {} - -// SpecSuiteDidEnd Prints a newline between "35 Passed | 0 Failed | 0 Pending | 0 Skipped" and "--- PASS:" -func (newlineReporter) SpecSuiteDidEnd(summary *SuiteSummary) { fmt.Printf("\n") }