From afca7dd6fe6d25583df7bd80466c456c46bdc7ca Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Mon, 22 Jul 2024 15:58:00 +0800 Subject: [PATCH] Replace RunSpecsWithDefaultAndCustomReporters with RunSpecs. Signed-off-by: Xun Jiang --- test/Makefile | 4 ++-- test/e2e/e2e_suite_test.go | 4 +--- test/perf/e2e_suite_test.go | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/Makefile b/test/Makefile index 956054a976..fbc0e08e35 100644 --- a/test/Makefile +++ b/test/Makefile @@ -166,7 +166,7 @@ run-e2e: ginkgo (echo "Bucket to store the backups from E2E tests is required, please re-run with BSL_BUCKET="; exit 1 ) @[ "${CLOUD_PROVIDER}" ] && echo "Using cloud provider ${CLOUD_PROVIDER}" || \ (echo "Cloud provider for target cloud/plugin provider is required, please rerun with CLOUD_PROVIDER="; exit 1) - @$(GINKGO) -v $(FOCUS_STR) $(SKIP_STR) ./e2e -- $(COMMON_ARGS) \ + @$(GINKGO) run -v $(FOCUS_STR) $(SKIP_STR) --junit-report report.xml ./e2e -- $(COMMON_ARGS) \ -upgrade-from-velero-cli=$(UPGRADE_FROM_VELERO_CLI) \ -upgrade-from-velero-version=$(UPGRADE_FROM_VELERO_VERSION) \ -migrate-from-velero-cli=$(MIGRATE_FROM_VELERO_CLI) \ @@ -200,7 +200,7 @@ run-perf: ginkgo (echo "Bucket to store the backups from E2E tests is required, please re-run with BSL_BUCKET="; exit 1 ) @[ "${CLOUD_PROVIDER}" ] && echo "Using cloud provider ${CLOUD_PROVIDER}" || \ (echo "Cloud provider for target cloud/plugin provider is required, please rerun with CLOUD_PROVIDER="; exit 1) - @$(GINKGO) -v $(FOCUS_STR) $(SKIP_STR) ./perf -- $(COMMON_ARGS) \ + @$(GINKGO) run -v $(FOCUS_STR) $(SKIP_STR) --junit-report report.xml ./perf -- $(COMMON_ARGS) \ -nfs-server-path=$(NFS_SERVER_PATH) \ -test-case-describe=$(TEST_CASE_DESCRIBE) \ -backup-for-restore=$(BACKUP_FOR_RESTORE) \ diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index ec981e0b6f..45b093b13b 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -26,7 +26,6 @@ import ( "time" . "github.com/onsi/ginkgo/v2" - "github.com/onsi/ginkgo/v2/reporters" . "github.com/onsi/gomega" "github.com/vmware-tanzu/velero/pkg/cmd/cli/install" @@ -245,8 +244,7 @@ func TestE2e(t *testing.T) { } RegisterFailHandler(Fail) - junitReporter := reporters.NewJUnitReporter("report.xml") - RunSpecsWithDefaultAndCustomReporters(t, "E2e Suite", []Reporter{junitReporter}) + RunSpecs(t, "E2e Suite") } var _ = BeforeSuite(func() { diff --git a/test/perf/e2e_suite_test.go b/test/perf/e2e_suite_test.go index cc7777db9e..a2aa85d63c 100644 --- a/test/perf/e2e_suite_test.go +++ b/test/perf/e2e_suite_test.go @@ -24,7 +24,6 @@ import ( "time" . "github.com/onsi/ginkgo/v2" - "github.com/onsi/ginkgo/v2/reporters" . "github.com/onsi/gomega" "github.com/pkg/errors" @@ -114,8 +113,7 @@ func TestE2e(t *testing.T) { } RegisterFailHandler(Fail) - junitReporter := reporters.NewJUnitReporter("report.xml") - RunSpecsWithDefaultAndCustomReporters(t, "E2e Suite", []Reporter{junitReporter}) + RunSpecs(t, "E2e Suite") } var _ = BeforeSuite(func() {