diff --git a/test b/test index 95c40ae1e..796512800 100755 --- a/test +++ b/test @@ -162,7 +162,7 @@ function integration_pass { # expectation could be different USERTIMEOUT="" if [ -z "${TIMEOUT}" ]; then - USERTIMEOUT="20m" + USERTIMEOUT="30m" else USERTIMEOUT="${TIMEOUT}" fi @@ -251,7 +251,7 @@ function cov_pass { mkdir -p "$COVERDIR" # run code coverage for unit and integration tests - GOCOVFLAGS="-covermode=set -coverpkg ${PKGS_COMMA} -v -timeout 20m" + GOCOVFLAGS="-covermode=set -coverpkg ${PKGS_COMMA} -v -timeout 30m" # shellcheck disable=SC2206 GOCOVFLAGS=($GOCOVFLAGS) failed="" @@ -309,7 +309,7 @@ function e2e_pass { # expectation could be different USERTIMEOUT="" if [ -z "${TIMEOUT}" ]; then - USERTIMEOUT="20m" + USERTIMEOUT="30m" else USERTIMEOUT="${TIMEOUT}" fi @@ -320,9 +320,9 @@ function e2e_pass { function integration_e2e_pass { echo "Running integration and e2e tests..." - go test -timeout 20m -v -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/tests/e2e" & + go test -timeout 30m -v -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/tests/e2e" & e2epid="$!" - go test -timeout 20m -v -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/integration" & + go test -timeout 30m -v -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/integration" & intpid="$!" wait $e2epid wait $intpid @@ -330,9 +330,9 @@ function integration_e2e_pass { } function grpcproxy_pass { - go test -timeout 20m -v ${RACE} -tags cluster_proxy -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/integration" - go test -timeout 20m -v ${RACE} -tags cluster_proxy -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/clientv3/integration" - go test -timeout 20m -v -tags cluster_proxy "$@" "${REPO_PATH}/tests/e2e" + go test -timeout 30m -v ${RACE} -tags cluster_proxy -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/integration" + go test -timeout 30m -v ${RACE} -tags cluster_proxy -cpu "${TEST_CPUS}" "$@" "${REPO_PATH}/clientv3/integration" + go test -timeout 30m -v -tags cluster_proxy "$@" "${REPO_PATH}/tests/e2e" } function release_pass {