Skip to content

Commit b42b25c

Browse files
Revert ":bug: Client go version metrics endpoint test (#1821)"
This reverts commit fed0ad5.
1 parent 44ba340 commit b42b25c

File tree

5 files changed

+270
-361
lines changed

5 files changed

+270
-361
lines changed

Makefile

+3-7
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ test: manifests generate fmt lint test-unit test-e2e #HELP Run all tests.
186186

187187
.PHONY: e2e
188188
e2e: #EXHELP Run the e2e tests.
189-
go test -count=1 -v -run "$(if $(TEST_FILTER),$(TEST_FILTER),.)" ./test/e2e/...
189+
go test -count=1 -v ./test/e2e/...
190190

191191
E2E_REGISTRY_NAME := docker-registry
192192
E2E_REGISTRY_NAMESPACE := operator-controller-e2e
@@ -202,10 +202,7 @@ test-ext-dev-e2e: $(OPERATOR_SDK) $(KUSTOMIZE) $(KIND) #HELP Run extension creat
202202
test/extension-developer-e2e/setup.sh $(OPERATOR_SDK) $(CONTAINER_RUNTIME) $(KUSTOMIZE) $(KIND) $(KIND_CLUSTER_NAME) $(E2E_REGISTRY_NAMESPACE)
203203
go test -count=1 -v ./test/extension-developer-e2e/...
204204

205-
# Define TEST_PKGS to be either user-specified or a default set of packages:
206-
ifeq ($(origin TEST_PKGS), undefined)
207-
TEST_PKGS := $(shell go list ./... | grep -v /test/)
208-
endif
205+
UNIT_TEST_DIRS := $(shell go list ./... | grep -v /test/)
209206
COVERAGE_UNIT_DIR := $(ROOT_DIR)/coverage/unit
210207

211208
.PHONY: envtest-k8s-bins #HELP Uses setup-envtest to download and install the binaries required to run ENVTEST-test based locally at the project/bin directory.
@@ -221,8 +218,7 @@ test-unit: $(SETUP_ENVTEST) envtest-k8s-bins #HELP Run the unit tests
221218
-tags '$(GO_BUILD_TAGS)' \
222219
-cover -coverprofile ${ROOT_DIR}/coverage/unit.out \
223220
-count=1 -race -short \
224-
-run "$(if $(TEST_FILTER),$(TEST_FILTER),.)" \
225-
$(TEST_PKGS) \
221+
$(UNIT_TEST_DIRS) \
226222
-test.gocoverdir=$(COVERAGE_UNIT_DIR)
227223

228224
.PHONY: image-registry

0 commit comments

Comments
 (0)