TT#46791 Improve 'prove' output for Selenium and REST API tests

It improves readability slightly.

Change-Id: Iaecd72eded4f495a38e2009eef89445f6517b688
changes/76/26176/1
Alexander Lutay 7 years ago
parent 82172e5b1a
commit c2ae23fff9

@ -46,13 +46,13 @@ RC=0
if [ "${FORMAT}" = "junit" ] ; then
# shellcheck disable=SC2086
prove -m --formatter TAP::Formatter::JUnit -l -It/lib $SELECT | \
prove -ofmv --formatter TAP::Formatter::JUnit -l -It/lib $SELECT | \
tee -a "${OUTPUT_DIRECTORY}/api-rest.xml"
RC=${PIPESTATUS[0]}
else
# api-threads.t and api-balanceintervals.t are failing with the "-Pretty option" :(
# shellcheck disable=SC2086
prove -m -v --color -l -It/lib $SELECT | tee -a "${OUTPUT_DIRECTORY}/api-rest.pretty"
prove -ofmv --color -l -It/lib $SELECT | tee -a "${OUTPUT_DIRECTORY}/api-rest.pretty"
RC=${PIPESTATUS[0]}
fi

@ -52,11 +52,11 @@ echo "Watch at test runs by connecting via VNC (password: '${PASSWORD}'):"
echo "echo -e '$PASSWORD_ENCODED' >/tmp/vncpasswd ; vncviewer geometry=1280x1024x16 passwd=/tmp/vncpasswd localhost:5999"
if [ -n "${3:-}" ] && [ "${3:-}" = "junit" ] ; then
CATALYST_SERVER=https://${SERVER}:1443/ prove -m --formatter TAP::Formatter::JUnit -l -It/lib t/selenium/*.t | \
CATALYST_SERVER=https://${SERVER}:1443/ prove -ofmv --formatter TAP::Formatter::JUnit -l -It/lib t/selenium/*.t | \
tee -a "${OUTPUT_DIRECTORY}/selenium.xml"
RC="${PIPESTATUS[0]}"
else
CATALYST_SERVER="https://${SERVER}:1443" prove -m -v --color -l -It/lib t/selenium/*.t | \
CATALYST_SERVER="https://${SERVER}:1443" prove -ofmv --color -l -It/lib t/selenium/*.t | \
tee -a "${OUTPUT_DIRECTORY}/selenium.pretty"
RC="${PIPESTATUS[0]}"
fi
@ -68,3 +68,7 @@ for file in "${OUTPUT_DIRECTORY}/selenium.pretty" "${OUTPUT_DIRECTORY}/selenium.
fi
done
echo "################################################################################"
## exit cleanly here, Jenkins will detect errors in produced artifacts if any
## as a result the Jenkins job will be "yellow" instead of "red".
# exit "${RC}"

Loading…
Cancel
Save