aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergii Tkachenko <sergiitk@google.com>2022-09-08 14:00:19 -0700
committerGitHub <noreply@github.com>2022-09-08 14:00:19 -0700
commite7b8f623c0095a801646df3230d81814b4c65f98 (patch)
tree4f2ca345916d206020b736d8312f8c40032eabcd
parentafc38746e8460653acc4dcd830e7d021fb25ae5e (diff)
downloadgrpc-grpc-upstream-v1.40.x.tar.gz
xDS interop: buildscripts: fix run_test return status (#30768) (#30884)upstream-v1.40.x
To capture the return status of the test in run_test the last command must be the call to the test itself. This removes `set +x`, which makes the run_test always return success, and not propagate the test status. I can't find it, but this exact error bit us before. Looks like it leaked to other scripts. The good thing is if the test was executed, it's failure would still be picked up from the result xml. However, if the test framework didn't start in the first place, the result will be false positive. Example: https://source.cloud.google.com/results/invocations/98d3e679-ec8a-40bd-9f36-88179747b0d6/targets ``` /home/kbuilder/.pyenv/versions/k8s_xds_test_runner/bin/python3: Error while finding module specification for 'tests.authz_test' (ModuleNotFoundError: No module named 'tests') + set +x Failed test suites: 0 [ID: 3548168] Command finished after 625 secs, exit value: 0 ```
-rwxr-xr-xtools/internal_ci/linux/grpc_xds_url_map.sh1
-rwxr-xr-xtools/internal_ci/linux/grpc_xds_url_map_python.sh1
-rwxr-xr-xtools/internal_ci/linux/psm-security.sh1
3 files changed, 0 insertions, 3 deletions
diff --git a/tools/internal_ci/linux/grpc_xds_url_map.sh b/tools/internal_ci/linux/grpc_xds_url_map.sh
index 918182a404..30de7b1dd8 100755
--- a/tools/internal_ci/linux/grpc_xds_url_map.sh
+++ b/tools/internal_ci/linux/grpc_xds_url_map.sh
@@ -102,7 +102,6 @@ run_test() {
--log_dir="${out_dir}" \
--xml_output_file="${out_dir}/sponge_log.xml" \
|& tee "${out_dir}/sponge_log.log"
- set +x
}
#######################################
diff --git a/tools/internal_ci/linux/grpc_xds_url_map_python.sh b/tools/internal_ci/linux/grpc_xds_url_map_python.sh
index 29c6f5159e..ccbaa1b8d7 100755
--- a/tools/internal_ci/linux/grpc_xds_url_map_python.sh
+++ b/tools/internal_ci/linux/grpc_xds_url_map_python.sh
@@ -112,7 +112,6 @@ run_test() {
--log_dir="${out_dir}" \
--xml_output_file="${out_dir}/sponge_log.xml" \
|& tee "${out_dir}/sponge_log.log"
- set +x
}
#######################################
diff --git a/tools/internal_ci/linux/psm-security.sh b/tools/internal_ci/linux/psm-security.sh
index 735698876b..d523cd1ff4 100755
--- a/tools/internal_ci/linux/psm-security.sh
+++ b/tools/internal_ci/linux/psm-security.sh
@@ -116,7 +116,6 @@ run_test() {
--log_dir="${out_dir}" \
--xml_output_file="${out_dir}/sponge_log.xml" \
|& tee "${out_dir}/sponge_log.log"
- set +x
}
#######################################