Some improvements to #5687

This commit is contained in:
nikhiljindal 2015-03-26 14:27:42 -07:00
parent aa417ca2db
commit f56aa58741
2 changed files with 3 additions and 8 deletions

View File

@ -194,11 +194,6 @@ runTests() {
kube::log::status "Combined coverage report: ${coverage_html_file}" kube::log::status "Combined coverage report: ${coverage_html_file}"
} }
runTestsForVersion() {
export KUBE_API_VERSION="$1"
runTests "${@:2}"
}
reportCoverageToCoveralls() { reportCoverageToCoveralls() {
if [[ -x "${KUBE_GOVERALLS_BIN}" ]]; then if [[ -x "${KUBE_GOVERALLS_BIN}" ]]; then
${KUBE_GOVERALLS_BIN} -coverprofile="${COMBINED_COVER_PROFILE}" || true ${KUBE_GOVERALLS_BIN} -coverprofile="${COMBINED_COVER_PROFILE}" || true
@ -209,7 +204,7 @@ reportCoverageToCoveralls() {
IFS=',' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}" IFS=',' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}"
for apiVersion in "${apiVersions[@]}"; do for apiVersion in "${apiVersions[@]}"; do
echo "Running tests for APIVersion: $apiVersion" echo "Running tests for APIVersion: $apiVersion"
runTestsForVersion $apiVersion "${@}" KUBE_API_VERSION="${apiVersion}" runTests "$@"
done done
# We might run the tests for multiple versions, but we want to report only # We might run the tests for multiple versions, but we want to report only

View File

@ -55,7 +55,7 @@ runTests() {
trap cleanup EXIT trap cleanup EXIT
# Convert the CSV to an array of API versions to test # Convert the CSV to an array of API versions to test
IFS=',' read -a apiVersions <<< ${KUBE_TEST_API_VERSIONS} IFS=',' read -a apiVersions <<< "${KUBE_TEST_API_VERSIONS}"
for apiVersion in "${apiVersions[@]}"; do for apiVersion in "${apiVersions[@]}"; do
runTests $apiVersion runTests "${apiVersion}"
done done