Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

Commit 1e02cf5

Browse files
authored
Merge pull request #550 from cprivitere/e2e-wrapped-client-fix
🐛 E2e-wrapped-client-fix
2 parents 3921658 + 3d46aad commit 1e02cf5

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,12 @@ $(E2E_CONF_FILE): $(ENVSUBST) $(E2E_CONF_FILE_SOURCE)
159159
run-e2e-tests: $(KUSTOMIZE) $(GINKGO) $(E2E_CONF_FILE) e2e-test-templates $(if $(SKIP_IMAGE_BUILD),,e2e-image) ## Run the e2e tests
160160
$(MAKE) set-manifest-image MANIFEST_IMG=$(REGISTRY)/$(IMAGE_NAME) MANIFEST_TAG=$(TAG)
161161
$(MAKE) set-manifest-pull-policy PULL_POLICY=IfNotPresent
162-
cd test/e2e; time $(GINKGO) -v --trace --progress --tags=e2e \
163-
--randomizeAllSpecs -race $(GINKGO_ADDITIONAL_ARGS) \
162+
cd test/e2e; time $(GINKGO) -v --trace --tags=e2e \
163+
--randomize-all -race $(GINKGO_ADDITIONAL_ARGS) \
164164
--focus=$(GINKGO_FOCUS) --skip=$(GINKGO_SKIP) \
165-
-nodes=$(GINKGO_NODES) --noColor=$(GINKGO_NOCOLOR) \
165+
-nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) \
166166
--output-dir="$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" \
167-
--flakeAttempts=$(GINKGO_FLAKE_ATTEMPTS) ./ -- \
167+
--flake-attempts=$(GINKGO_FLAKE_ATTEMPTS) ./ -- \
168168
-e2e.artifacts-folder="$(ARTIFACTS)" \
169169
-e2e.config="$(E2E_CONF_FILE)" \
170170
-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) \

test/e2e/common_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,13 @@ func (wc *wrappedClient) DeleteAllOf(ctx context.Context, obj client.Object, opt
329329
return wc.client.DeleteAllOf(ctx, obj, opts...)
330330
}
331331

332-
func (wc *wrappedClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
332+
func (wc *wrappedClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
333333
err := wc.recordClusterNameForResource(obj)
334334
if err != nil {
335335
return err
336336
}
337337

338-
return wc.client.Get(ctx, key, obj)
338+
return wc.client.Get(ctx, key, obj, opts...)
339339
}
340340

341341
func (wc *wrappedClient) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {

0 commit comments

Comments
 (0)