From e80a6eba788f280646b00ee0ebc1fecec883ba3f Mon Sep 17 00:00:00 2001 From: YaoZengzeng Date: Thu, 25 Jul 2024 20:41:32 +0800 Subject: [PATCH 1/3] enable select some e2e cases to run or skip some cases Signed-off-by: YaoZengzeng --- docs/proposal/e2e.md | 1 + test/e2e/run_test.sh | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/proposal/e2e.md b/docs/proposal/e2e.md index b2b5079f6..debe7e04a 100644 --- a/docs/proposal/e2e.md +++ b/docs/proposal/e2e.md @@ -101,3 +101,4 @@ For example, if we want to repeatedly run the E2E test locally, then except for ```bash ./test/e2e/run_test.sh --only-run-tests ``` +NOTE: As the Kmesh E2E test framework is still evolving rapidly, please refer to the [official doc](https://kmesh.net/en/docs/developer/e2e-guide/) for more complete and fresh usage. diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index e260f3d3b..8e3769995 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -184,6 +184,8 @@ function install_dependencies() { rm -rf istio-${ISTIO_VERSION} } +PARAMS="" + while (( "$#" )); do case "$1" in --skip-install-dep) @@ -208,6 +210,15 @@ while (( "$#" )); do IPV6=true shift ;; + --select-cases) + echo "params is \"$2\"" + PARAMS+="-test.run \"$2\"" + shift 2 + ;; + --skip-cases) + PARAMS+="-test.skip \"$2\"" + shift 2 + ;; esac done @@ -230,4 +241,6 @@ if [[ -z "${SKIP_SETUP:-}" ]]; then setup_kmesh fi -go test -v -tags=integ $ROOT_DIR/test/e2e/... -count=1 +cmd="go test -v -tags=integ $ROOT_DIR/test/e2e/... -count=1 $PARAMS" + +eval $cmd From 23956e371ce466dc1a6da0dd1033cdaf807c58ed Mon Sep 17 00:00:00 2001 From: YaoZengzeng Date: Thu, 25 Jul 2024 20:47:47 +0800 Subject: [PATCH 2/3] delete debug output Signed-off-by: YaoZengzeng --- test/e2e/run_test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index 8e3769995..1227ab3e7 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -211,7 +211,6 @@ while (( "$#" )); do shift ;; --select-cases) - echo "params is \"$2\"" PARAMS+="-test.run \"$2\"" shift 2 ;; From 4a7807bfe83848c2dd46190a94b9356bea8e94fd Mon Sep 17 00:00:00 2001 From: YaoZengzeng Date: Fri, 26 Jul 2024 11:07:04 +0800 Subject: [PATCH 3/3] fix comments Signed-off-by: YaoZengzeng --- test/e2e/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/run_test.sh b/test/e2e/run_test.sh index 1227ab3e7..bd4e2ed2c 100755 --- a/test/e2e/run_test.sh +++ b/test/e2e/run_test.sh @@ -242,4 +242,4 @@ fi cmd="go test -v -tags=integ $ROOT_DIR/test/e2e/... -count=1 $PARAMS" -eval $cmd +bash -c "$cmd"