Skip to content

Commit

Permalink
Update Ginkgo V2 flag names
Browse files Browse the repository at this point in the history
Ginkgo v2 supports different naming for flags
  • Loading branch information
razo7 committed Feb 1, 2023
1 parent d5c7eed commit 8d8bd9a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 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
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path --bin-dir $(LOCALBIN))" $(GINKGO) -r --keep-going --require-suite --vv ./api/... ./controllers/... --coverprofile cover.out

##@ Bundle Creation Addition
## Some addition to bundle creation in the bundle
Expand Down
13 changes: 7 additions & 6 deletions hack/functest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fi

# never colors in OpenshiftCI?
if [ -n "${OPENSHIFT_CI}" ]; then
NO_COLOR="-noColor"
NO_COLOR="--no-color"
fi

if [ $# -ne 1 ]
Expand All @@ -25,11 +25,12 @@ else
echo "Running E2e test with ginkgo version $1"
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
# -r: If set, ginkgo finds and runs test suites under the current directory recursively.
# --keep-going: If set, failures from earlier test suites do not prevent later test suites from running.
# --require-suite: If set, Ginkgo fails if there are ginkgo tests in a directory but no invocation of RunSpecs.
# --no-color: If set, suppress color output in default reporter.
# --vv: If set, emits with maximal verbosity - includes skipped and pending tests.
./bin/ginkgo/$1/ginkgo -r --keep-going --require-suite $NO_COLOR --vv ./test/e2e

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

0 comments on commit 8d8bd9a

Please sign in to comment.