Skip to content

Commit

Permalink
Apply Ginkgo v2 changes
Browse files Browse the repository at this point in the history
Some deprecation and changes due to the major version bumping
  • Loading branch information
razo7 committed Jan 30, 2023
1 parent e64d486 commit 69da861
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ test: test-no-verify verify-unchanged ## Generate and format code, run tests, ge

.PHONY: test-no-verify
test-no-verify: manifests generate go-verify fmt vet envtest ginkgo ## Generate and format code, and run tests
ACK_GINKGO_DEPRECATIONS=$(GINKGO_VERSION) KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -v -r --keepGoing -requireSuite ./api/... ./controllers/... -coverprofile cover.out
ACK_GINKGO_DEPRECATIONS=$(GINKGO_VERSION) KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -v -r --keep-going -require-suite ./api/... ./controllers/... -coverprofile cover.out

##@ Bundle Creation Addition
## Some addition to bundle creation in the bundle
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/webhook_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ var _ = BeforeSuite(func() {
return nil
}).Should(Succeed())

}, 60)
})

var _ = AfterSuite(func() {
cancel()
Expand Down
2 changes: 1 addition & 1 deletion controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var _ = BeforeSuite(func() {

// call start or refactor when moving to "normal" testEnv test

}, 60)
})

func startTestEnv() {
By("bootstrapping test environment")
Expand Down
6 changes: 3 additions & 3 deletions hack/functest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ fi

# -v: print out the text and location for each spec before running it and flush output to stdout in realtime
# -r: run suites recursively
# --keepGoing: don't stop on failing suite
# -requireSuite: fail if tests are not executed because of missing suite
ACK_GINKGO_DEPRECATIONS=$1 ./bin/ginkgo/$1/ginkgo $NO_COLOR -v -r --keepGoing -requireSuite ./test/e2e
# --keep-going: don't stop on failing suite
# -require-suite: fail if tests are not executed because of missing suite
ACK_GINKGO_DEPRECATIONS=$1 ./bin/ginkgo/$1/ginkgo $NO_COLOR -v -r --keep-going -require-suite ./test/e2e

if [[ $? != 0 ]]; then
echo "E2e tests FAILED"
Expand Down

0 comments on commit 69da861

Please sign in to comment.