UPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups

camilamacedo86 · openshift-merge-bot[bot] · commit ea60189f95af · 2025-06-10T05:57:12.000Z
diff --git a/openshift/default-catalog-consistency/.gitignore b/openshift/default-catalog-consistency/.gitignore
@@ -1,2 +1,5 @@
 # Binaries for programs and plugins
 bin/*
+
+# Output from tests
+*.xml
diff --git a/openshift/default-catalog-consistency/Makefile b/openshift/default-catalog-consistency/Makefile
@@ -22,13 +22,6 @@ help: #HELP Display essential help.
 	@awk 'BEGIN {FS = ":[^#]*#HELP"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n\n"} /^[a-zA-Z_0-9-]+:.*#HELP / { printf "  \033[36m%-17s\033[0m %s\n", $$1, $$2 } ' $(MAKEFILE_LIST)
 
 #SECTION Tests
-
-# Set the Ginkgo binary path. Assumes it's installed via `go install`
-GOBIN ?= $(shell go env GOBIN)
-ifeq ($(GOBIN),)
-  GOBIN := $(shell go env GOPATH)/bin
-endif
-
 TOOLS_BIN_DIR := $(CURDIR)/bin
 GINKGO := $(TOOLS_BIN_DIR)/ginkgo
 
diff --git a/openshift/default-catalog-consistency/test/validate/suite_test.go b/openshift/default-catalog-consistency/test/validate/suite_test.go
@@ -18,7 +18,7 @@ import (
 
 func TestSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Validate Catalog Test Suite")
+	RunSpecs(t, "OLM-Catalog-Validation")
 }
 
 // images is a list of image references to be validated.
@@ -29,7 +29,7 @@ var images = []string{
 	"registry.redhat.io/redhat/redhat-operator-index:v4.18",
 }
 
-var _ = Describe("Check Catalog Consistency", func() {
+var _ = Describe("OLM-Catalog-Validation", func() {
 	authPath := os.Getenv("REGISTRY_AUTH_FILE")
 
 	// Force image resolution to Linux to avoid OS mismatch errors on macOS,

-Original file line number
+Diff line change
@@ @@ -1,2 +1,5 @@ @@
 # Binaries for programs and plugins
 bin/*
++
 +# Output from tests
 +*.xml
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`
`19`	`19`	`func TestSuite(t *testing.T) {`
`20`	`20`	`RegisterFailHandler(Fail)`
`21`		`- RunSpecs(t, "Validate Catalog Test Suite")`
	`21`	`+ RunSpecs(t, "OLM-Catalog-Validation")`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`// images is a list of image references to be validated.`
`@@ -29,7 +29,7 @@ var images = []string{`
`29`	`29`	`"registry.redhat.io/redhat/redhat-operator-index:v4.18",`
`30`	`30`	`}`
`31`	`31`
`32`		`-var _ = Describe("Check Catalog Consistency", func() {`
	`32`	`+var _ = Describe("OLM-Catalog-Validation", func() {`
`33`	`33`	`authPath := os.Getenv("REGISTRY_AUTH_FILE")`
`34`	`34`
`35`	`35`	`// Force image resolution to Linux to avoid OS mismatch errors on macOS,`