mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-25 14:30:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5598 from owncloud/allow-plain-acceptance-test-output

Browse Source 
[tests-only] allow plain acceptance test output
This commit is contained in:
Phil Davis
2023-02-21 14:09:59 +05:45
committed by GitHub
parent 22f3577b7d 213202dc1c
commit 7ec0e3c65c
2 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/acceptance/lint-expected-failures.sh
View File

@@ -1,15 +1,30 @@
#!/usr/bin/env bash
log_error() {
echo -e "\e[31m$1\e[0m"
if [ -n "${PLAIN_OUTPUT}" ]
then
echo -e "$1"
else
echo -e "\e[31m$1\e[0m"
fi
}
log_info() {
echo -e "\e[34m$1\e[0m"
if [ -n "${PLAIN_OUTPUT}" ]
then
echo -e "$1"
else
echo -e "\e[34m$1\e[0m"
fi
}
log_success() {
echo -e "\e[32m$1\e[0m"
if [ -n "${PLAIN_OUTPUT}" ]
then
echo -e "$1"
else
echo -e "\e[32m$1\e[0m"
fi
}
declare -A scenarioLines

37
tests/acceptance/run.sh
View File

@@ -22,6 +22,21 @@ then
STEP_THROUGH_OPTION="--step-through"
fi
if [ -n "${PLAIN_OUTPUT}" ]
then
# explicitly tell Behat to not do colored output
COLORS_OPTION="--no-colors"
# Use the Bash "null" command to do nothing, rather than use tput to set a color
RED_COLOR = ":"
GREEN_COLOR = ":"
YELLOW_COLOR = ":"
else
COLORS_OPTION="--colors"
RED_COLOR = "tput setaf 1"
GREEN_COLOR = "tput setaf 2"
YELLOW_COLOR = "tput setaf 3"
fi
# The following environment variables can be specified:
#
# ACCEPTANCE_TEST_TYPE - see "--type" description
@@ -180,7 +195,7 @@ function run_behat_tests() {
fi
echo "Using behat config '${BEHAT_YML}'"
${BEHAT} --colors --strict ${STEP_THROUGH_OPTION} -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} --tags ${BEHAT_FILTER_TAGS} ${BEHAT_FEATURE} -v 2>&1 | tee -a ${TEST_LOG_FILE}
${BEHAT} ${COLORS_OPTION} --strict ${STEP_THROUGH_OPTION} -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} --tags ${BEHAT_FILTER_TAGS} ${BEHAT_FEATURE} -v 2>&1 | tee -a ${TEST_LOG_FILE}
BEHAT_EXIT_STATUS=${PIPESTATUS[0]}
@@ -207,7 +222,7 @@ function run_behat_tests() {
# So exit the tests and do not lint expected failures when undefined steps exist.
if [[ ${SCENARIO_RESULTS} == *"undefined"* ]]
then
echo -e "\033[31m Undefined steps: There were some undefined steps found."
${RED_COLOR}; echo -e "Undefined steps: There were some undefined steps found."
exit 1
fi
# If there were no scenarios in the requested suite or feature that match
@@ -348,7 +363,7 @@ function run_behat_tests() {
# Big red error output is displayed if there are no matching scenarios - send it to null
DRY_RUN_FILE=$(mktemp)
SKIP_TAGS="${TEST_TYPE_TAG}&&@skip"
${BEHAT} --dry-run --colors -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} --tags "${SKIP_TAGS}" ${BEHAT_FEATURE} 1>${DRY_RUN_FILE} 2>/dev/null
${BEHAT} --dry-run {$COLORS_OPTION} -c ${BEHAT_YML} -f pretty ${BEHAT_SUITE_OPTION} --tags "${SKIP_TAGS}" ${BEHAT_FEATURE} 1>${DRY_RUN_FILE} 2>/dev/null
if grep -q -m 1 'No scenarios' "${DRY_RUN_FILE}"
then
# If there are no skip scenarios, then no need to report that
@@ -636,24 +651,24 @@ fi
if [ "${UNEXPECTED_FAILURE}" = true ]
then
tput setaf 3; echo "runsh: Total unexpected failed scenarios throughout the test run:"
tput setaf 1; printf "%s\n" "${UNEXPECTED_FAILED_SCENARIOS[@]}"
${YELLOW_COLOR}; echo "runsh: Total unexpected failed scenarios throughout the test run:"
${RED_COLOR}; printf "%s\n" "${UNEXPECTED_FAILED_SCENARIOS[@]}"
else
tput setaf 2; echo "runsh: There were no unexpected failures."
${GREEN_COLOR}; echo "runsh: There were no unexpected failures."
fi
if [ "${UNEXPECTED_SUCCESS}" = true ]
then
tput setaf 3; echo "runsh: Total unexpected passed scenarios throughout the test run:"
tput setaf 1; printf "%s\n" "${ACTUAL_UNEXPECTED_PASS[@]}"
${YELLOW_COLOR}; echo "runsh: Total unexpected passed scenarios throughout the test run:"
${RED_COLOR}; printf "%s\n" "${ACTUAL_UNEXPECTED_PASS[@]}"
else
tput setaf 2; echo "runsh: There were no unexpected success."
${GREEN_COLOR}; echo "runsh: There were no unexpected success."
fi
if [ "${UNEXPECTED_BEHAT_EXIT_STATUS}" = true ]
then
tput setaf 3; echo "runsh: The following Behat test runs exited with non-zero status:"
tput setaf 1; printf "%s\n" "${UNEXPECTED_BEHAT_EXIT_STATUSES[@]}"
${YELLOW_COLOR}; echo "runsh: The following Behat test runs exited with non-zero status:"
${RED_COLOR}; printf "%s\n" "${UNEXPECTED_BEHAT_EXIT_STATUSES[@]}"
fi
# sync the file-system so all output will be flushed to storage.