X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fe3f19bb8f0a684de9c5a7d1f7c619943d0daca0..aca461985963f60c185a02c53377d75eebf26266:/build/run-tests.sh diff --git a/build/run-tests.sh b/build/run-tests.sh index f56e46ab8b..30a80f527a 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -2,6 +2,9 @@ . `dirname "$(readlink -f "$0")"`/libcloud-pin +COLUMNS=80 +. `dirname "$(readlink -f "$0")"`/run-library.sh + read -rd "\000" helpmessage <= 1.6 required. See http://golang.org/doc/install" echo -n 'gcc: ' gcc --version | egrep ^gcc \ || fatal "No gcc. Try: apt-get install build-essential" @@ -219,6 +210,9 @@ do --only) only="$1"; skip[$1]=""; shift ;; + --short) + short=1 + ;; --skip-install) skip_install=1 ;; @@ -401,7 +395,12 @@ setup_virtualenv() { if ! [[ -e "$venvdest/bin/activate" ]] || ! [[ -e "$venvdest/bin/pip" ]]; then virtualenv --setuptools "$@" "$venvdest" || fatal "virtualenv $venvdest failed" fi - "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7' + if [[ $("$venvdest/bin/python" --version 2>&1) =~ \ 3\.[012]\. ]]; then + # pip 8.0.0 dropped support for python 3.2, e.g., debian wheezy + "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7,<8' + else + "$venvdest/bin/pip" install 'setuptools>=18' 'pip>=7' + fi # ubuntu1404 can't seem to install mock via tests_require, but it can do this. "$venvdest/bin/pip" install 'mock>=1.0' 'pbr<1.7.0' } @@ -470,23 +469,6 @@ then gem install --user-install bundler || fatal 'Could not install bundler' fi -checkexit() { - if [[ "$1" != "0" ]]; then - title "!!!!!! $2 FAILED !!!!!!" - failures+=("$2 (`timer`)") - else - successes+=("$2 (`timer`)") - fi -} - -timer_reset() { - t0=$SECONDS -} - -timer() { - echo -n "$(($SECONDS - $t0))s" -} - retry() { while ! ${@} && [[ "$retry" == 1 ]] do @@ -516,28 +498,29 @@ do_test_once() { # before trying "go test". Otherwise, coverage-reporting # mode makes Go show the wrong line numbers when reporting # compilation errors. + go get -t "git.curoverse.com/arvados.git/$1" || return 1 if [[ -n "${testargs[$1]}" ]] then # "go test -check.vv giturl" doesn't work, but this # does: - cd "$WORKSPACE/$1" && \ - go get -t "git.curoverse.com/arvados.git/$1" && \ - go test ${coverflags[@]} ${testargs[$1]} + cd "$WORKSPACE/$1" && go test ${short:+-short} ${testargs[$1]} else # The above form gets verbose even when testargs is # empty, so use this form in such cases: - go get -t "git.curoverse.com/arvados.git/$1" && \ - go test ${coverflags[@]} "git.curoverse.com/arvados.git/$1" + go test ${short:+-short} ${coverflags[@]} "git.curoverse.com/arvados.git/$1" fi result="$?" - go tool cover -html="$WORKSPACE/tmp/.$covername.tmp" -o "$WORKSPACE/tmp/$covername.html" - rm "$WORKSPACE/tmp/.$covername.tmp" + if [[ -f "$WORKSPACE/tmp/.$covername.tmp" ]] + then + go tool cover -html="$WORKSPACE/tmp/.$covername.tmp" -o "$WORKSPACE/tmp/$covername.html" + rm "$WORKSPACE/tmp/.$covername.tmp" + fi elif [[ "$2" == "pip" ]] then # $3 can name a path directory for us to use, including trailing # slash; e.g., the bin/ subdirectory of a virtualenv. cd "$WORKSPACE/$1" \ - && "${3}python" setup.py test ${testargs[$1]} + && "${3}python" setup.py ${short:+--short-tests-only} test ${testargs[$1]} elif [[ "$2" != "" ]] then "test_$2" @@ -599,11 +582,6 @@ do_install_once() { fi } -title () { - txt="********** $1 **********" - printf "\n%*s%s\n\n" $((($COLUMNS-${#txt})/2)) "" "$txt" -} - bundle_install_trylocal() { ( set -e @@ -729,8 +707,10 @@ do_install services/api apiserver declare -a gostuff gostuff=( + sdk/go/arvados sdk/go/arvadosclient sdk/go/blockdigest + sdk/go/httpserver sdk/go/manifest sdk/go/streamer sdk/go/crunchrunner @@ -739,6 +719,7 @@ gostuff=( services/keep-web services/keepstore sdk/go/keepclient + services/keep-balance services/keepproxy services/datamanager/summary services/datamanager/collection @@ -748,6 +729,7 @@ gostuff=( services/crunch-dispatch-slurm services/crunch-run tools/keep-rsync + tools/keep-block-check ) for g in "${gostuff[@]}" do @@ -778,7 +760,7 @@ stop_services test_apiserver() { rm -f "$WORKSPACE/services/api/git-commit.version" cd "$WORKSPACE/services/api" \ - && RAILS_ENV=test bundle exec rake test TESTOPTS=-v ${testargs[services/api]} + && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS=-v ${testargs[services/api]} } do_test services/api apiserver @@ -824,21 +806,21 @@ done test_workbench() { start_nginx_proxy_services \ && cd "$WORKSPACE/apps/workbench" \ - && RAILS_ENV=test bundle exec rake test TESTOPTS=-v ${testargs[apps/workbench]} + && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test TESTOPTS=-v ${testargs[apps/workbench]} } do_test apps/workbench workbench test_workbench_benchmark() { start_nginx_proxy_services \ && cd "$WORKSPACE/apps/workbench" \ - && RAILS_ENV=test bundle exec rake test:benchmark ${testargs[apps/workbench_benchmark]} + && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:benchmark ${testargs[apps/workbench_benchmark]} } do_test apps/workbench_benchmark workbench_benchmark test_workbench_profile() { start_nginx_proxy_services \ && cd "$WORKSPACE/apps/workbench" \ - && RAILS_ENV=test bundle exec rake test:profile ${testargs[apps/workbench_profile]} + && env RAILS_ENV=test ${short:+RAILS_TEST_SHORT=1} bundle exec rake test:profile ${testargs[apps/workbench_profile]} } do_test apps/workbench_profile workbench_profile