Skip to content

Commit a9d431c

Browse files
authored
fix: use the correct client in work applier ITs and set a longer timeout (#390)
1 parent a24443c commit a9d431c

File tree

4 files changed

+43
-43
lines changed

4 files changed

+43
-43
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ test: manifests generate fmt vet local-unit-test integration-test## Run tests.
145145
local-unit-test: $(ENVTEST) ## Run tests.
146146
export CGO_ENABLED=1 && \
147147
export KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" && \
148-
go test `go list ./pkg/... ./cmd/...` -race -coverpkg=./... -coverprofile=ut-coverage.xml -covermode=atomic -v -timeout=20m
148+
go test `go list ./pkg/... ./cmd/...` -race -coverpkg=./... -coverprofile=ut-coverage.xml -covermode=atomic -v -timeout=30m
149149

150150
.PHONY: integration-test
151151
integration-test: $(ENVTEST) ## Run tests.

pkg/controllers/workapplier/backoff_integration_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ var _ = Describe("exponential backoff", func() {
296296
deleteWorkObject(workName, memberReservedNSName2)
297297

298298
// Ensure that the AppliedWork object has been removed.
299-
appliedWorkRemovedActual := appliedWorkRemovedActual(workName, nsName)
299+
appliedWorkRemovedActual := appliedWorkRemovedActual(memberClient2, workName)
300300
Eventually(appliedWorkRemovedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove the AppliedWork object")
301301

302302
workRemovedActual := testutilsactuals.WorkObjectRemovedActual(ctx, hubClient, workName, memberReservedNSName2)
@@ -513,7 +513,7 @@ var _ = Describe("exponential backoff", func() {
513513
deleteWorkObject(workName, memberReservedNSName2)
514514

515515
// Ensure that the AppliedWork object has been removed.
516-
appliedWorkRemovedActual := appliedWorkRemovedActual(workName, nsName)
516+
appliedWorkRemovedActual := appliedWorkRemovedActual(memberClient2, workName)
517517
Eventually(appliedWorkRemovedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "Failed to remove the AppliedWork object")
518518

519519
workRemovedActual := testutilsactuals.WorkObjectRemovedActual(ctx, hubClient, workName, memberReservedNSName2)

0 commit comments

Comments
 (0)