Skip to content

Commit c48c4c6

Browse files
committed
Fix ginkgo deprecation warning
Fixed ginkgo warning You're using deprecated Ginkgo functionality: ============================================= --untilItFails is deprecated, use --until-it-fails instead Used consistent approach with this flag in e2e_node and e2e scripts.
1 parent 7935006 commit c48c4c6

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

build/root/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ define TEST_E2E_NODE_HELP_INFO
213213
# Defaults to "\[Flaky\]|\[Slow\]|\[Serial\]".
214214
# TEST_ARGS: A space-separated list of arguments to pass to node e2e test.
215215
# Defaults to "".
216-
# RUN_UNTIL_FAILURE: If true, pass --untilItFails to ginkgo so tests are run
216+
# RUN_UNTIL_FAILURE: If true, pass --until-it-fails=true to ginkgo so tests are run
217217
# repeatedly until they fail. Defaults to false.
218218
# REMOTE: If true, run the tests on a remote host. Defaults to false.
219219
# REMOTE_MODE: For REMOTE=true only. Mode for remote execution (eg. gce, ssh).

hack/ginkgo-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ if [[ -n "${CONFORMANCE_TEST_SKIP_REGEX:-}" ]]; then
149149
fi
150150

151151
if [[ "${GINKGO_UNTIL_IT_FAILS:-}" == true ]]; then
152-
ginkgo_args+=("--untilItFails=true")
152+
ginkgo_args+=("--until-it-fails=true")
153153
fi
154154

155155
FLAKE_ATTEMPTS=1

hack/make-rules/test-e2e-node.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ if [[ ${skip} != "" ]]; then
6666
ginkgoflags="${ginkgoflags} -skip=\"${skip}\" "
6767
fi
6868

69-
if [[ ${run_until_failure} != "" ]]; then
70-
ginkgoflags="${ginkgoflags} -untilItFails=${run_until_failure} "
69+
if [[ ${run_until_failure} == "true" ]]; then
70+
ginkgoflags="${ginkgoflags} --until-it-fails=true "
7171
fi
7272

7373
# Setup the directory to copy test artifacts (logs, junit.xml, etc) from remote host to local host

0 commit comments

Comments
 (0)