Skip to content

Commit e92e38f

Browse files
UPSTREAM: <carry>: [Default Catalog Consistency Test]: Rename Tests suite and small cleanups
1 parent 9ebfbbe commit e92e38f

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
# Binaries for programs and plugins
22
bin/*
3+
4+
# Output from tests
5+
*.xml

openshift/default-catalog-consistency/Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ help: #HELP Display essential help.
2222
@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)
2323

2424
#SECTION Tests
25-
26-
# Set the Ginkgo binary path. Assumes it's installed via `go install`
27-
GOBIN ?= $(shell go env GOBIN)
28-
ifeq ($(GOBIN),)
29-
GOBIN := $(shell go env GOPATH)/bin
30-
endif
31-
3225
TOOLS_BIN_DIR := $(CURDIR)/bin
3326
GINKGO := $(TOOLS_BIN_DIR)/ginkgo
3427

openshift/default-catalog-consistency/test/validate/suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ import (
1919

2020
func TestSuite(t *testing.T) {
2121
RegisterFailHandler(Fail)
22-
RunSpecs(t, "Validate Catalog Test Suite")
22+
RunSpecs(t, "OLM-Catalog-Validation")
2323
}
2424

25-
var _ = Describe("Check Catalog Consistency", func() {
25+
var _ = Describe("OLM-Catalog-Validation", func() {
2626
catalogsPath := "../../../catalogd/kustomize/overlays/openshift/catalogs"
2727
images, err := utils.ParseImageRefsFromCatalog(catalogsPath)
2828
Expect(err).ToNot(HaveOccurred())

0 commit comments

Comments
 (0)