diff --git a/staging/src/k8s.io/kubectl/pkg/apply/parse/suite_test.go b/staging/src/k8s.io/kubectl/pkg/apply/parse/suite_test.go index 010dc993295..9e3f5df7b97 100644 --- a/staging/src/k8s.io/kubectl/pkg/apply/parse/suite_test.go +++ b/staging/src/k8s.io/kubectl/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/staging/src/k8s.io/kubectl/pkg/apply/strategy/suite_test.go b/staging/src/k8s.io/kubectl/pkg/apply/strategy/suite_test.go index 56202fbdea2..c2522380d5d 100644 --- a/staging/src/k8s.io/kubectl/pkg/apply/strategy/suite_test.go +++ b/staging/src/k8s.io/kubectl/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/staging/src/k8s.io/kubectl/pkg/apps/apps_suite_test.go b/staging/src/k8s.io/kubectl/pkg/apps/apps_suite_test.go index 86296f75f6c..c6aa6987ae8 100644 --- a/staging/src/k8s.io/kubectl/pkg/apps/apps_suite_test.go +++ b/staging/src/k8s.io/kubectl/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/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_suite_test.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_suite_test.go index 539e6c84147..9201d4e6fc6 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/openapi_suite_test.go +++ b/staging/src/k8s.io/kubectl/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/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_suite_test.go b/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_suite_test.go index f217ff29914..feb39fa97dc 100644 --- a/staging/src/k8s.io/kubectl/pkg/util/openapi/validation/validation_suite_test.go +++ b/staging/src/k8s.io/kubectl/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") }