From 8486a93eb80d0ba888c7795747bbba81f1c2c16f Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 31 May 2022 09:53:34 -0400 Subject: [PATCH 1/1] 15370: Allow 20m for arvados-package tests. First run is slow, with no cached docker image. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- build/run-tests.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/build/run-tests.sh b/build/run-tests.sh index cc8e070a5c..ee52c4b9dd 100755 --- a/build/run-tests.sh +++ b/build/run-tests.sh @@ -69,6 +69,7 @@ apps/workbench_integration (*) apps/workbench_benchmark apps/workbench_profile cmd/arvados-client +cmd/arvados-package cmd/arvados-server doc lib/cli @@ -760,6 +761,10 @@ do_test_once() { then covername="coverage-$(echo "$1" | sed -e 's/\//_/g')" coverflags=("-covermode=count" "-coverprofile=$WORKSPACE/tmp/.$covername.tmp") + testflags=() + if [[ "$1" == "cmd/arvados-package" ]]; then + testflags+=("-timeout" "20m") + fi # We do "go install" here to catch compilation errors # before trying "go test". Otherwise, coverage-reporting # mode makes Go show the wrong line numbers when reporting @@ -770,11 +775,11 @@ do_test_once() { then # "go test -check.vv giturl" doesn't work, but this # does: - go test ${short:+-short} ${testargs[$1]} + go test ${short:+-short} ${testflags[@]} ${testargs[$1]} else # The above form gets verbose even when testargs is # empty, so use this form in such cases: - go test ${short:+-short} ${coverflags[@]} "git.arvados.org/arvados.git/$1" + go test ${short:+-short} ${testflags[@]} ${coverflags[@]} "git.arvados.org/arvados.git/$1" fi result=${result:-$?} if [[ -f "$WORKSPACE/tmp/.$covername.tmp" ]] -- 2.30.2