github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix record_command suppression of test errors

Browse Source
This commit is contained in:
Jordan Liggitt 2019-11-07 01:37:27 -05:00
parent 1678f42970
commit 4c3bf1a660
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/cmd/legacy-script.sh
View File

@ -128,16 +128,40 @@ function record_command() {
local output="${KUBE_JUNIT_REPORT_DIR:-/tmp/junit-results}" local output="${KUBE_JUNIT_REPORT_DIR:-/tmp/junit-results}"
echo "Recording: ${name}" echo "Recording: ${name}"
echo "Running command: $*" echo "Running command: $*"
if ! juLog -output="${output}" -class="test-cmd" -name="${name}" "$@" juLog -output="${output}" -class="test-cmd" -name="${name}" "$@"
then local exitCode=$?
if [[ ${exitCode} -ne 0 ]]; then
# Record failures for any non-canary commands
if [ "${name}" != "record_command_canary" ]; then
echo "Error when running ${name}" echo "Error when running ${name}"
foundError="${foundError}""${name}"", " foundError="${foundError}""${name}"", "
fi fi
elif [ "${name}" == "record_command_canary" ]; then
# If the canary command passed, fail
echo "record_command_canary succeeded unexpectedly"
foundError="${foundError}""${name}"", "
fi
set -o nounset set -o nounset
set -o errexit set -o errexit
} }
# Ensure our record_command stack correctly propagates and detects errexit failures in invoked commands - see https://issue.k8s.io/84871
foundError=""
function record_command_canary()
{
set -o nounset
set -o errexit
bogus-expected-to-fail
set +o nounset
set +o errexit
}
KUBE_JUNIT_REPORT_DIR=$(mktemp -d /tmp/record_command_canary.XXXXX) record_command record_command_canary
if [[ -n "${foundError}" ]]; then
echo "FAILED TESTS: record_command_canary"
exit 1
fi
# Stops the running kubectl proxy, if there is one. # Stops the running kubectl proxy, if there is one.
function stop-proxy() function stop-proxy()
{ {