vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

test: s/20m/30m/g 

Every other test build times out due to the 20 minute test timeout. I
doesn't seem like tests are actually hanging, it's more that 20 minutes
just isn't enough to run the tests any more.
release-3.4
Tobias Schottdorf 2019-06-20 22:54:56 +02:00
parent 5d30dccdaa
commit 362dfb4d08
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test
View File

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