From dd35fce66c336170b5bd2c8401197ec33d43a48f Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 7 Nov 2017 15:30:51 -0800 Subject: [PATCH] test: fail when test times out Signed-off-by: Gyu-Ho Lee --- .semaphore.sh | 2 +- hack/scripts-dev/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.semaphore.sh b/.semaphore.sh index 136314e52..b44c6f088 100755 --- a/.semaphore.sh +++ b/.semaphore.sh @@ -13,4 +13,4 @@ docker run \ gcr.io/etcd-development/etcd-test:go1.9.2 \ /bin/bash -c "${TEST_OPTS} ./test 2>&1 | tee test-${TEST_SUFFIX}.log" -! egrep "(--- FAIL:|leak)" -A10 -B50 test-${TEST_SUFFIX}.log +! egrep "(--- FAIL:|leak|panic: test timed out)" -A10 -B50 test-${TEST_SUFFIX}.log diff --git a/hack/scripts-dev/Makefile b/hack/scripts-dev/Makefile index 7ad3063d2..e7df6ec0d 100644 --- a/hack/scripts-dev/Makefile +++ b/hack/scripts-dev/Makefile @@ -94,7 +94,7 @@ test: $(info TEST_OPTS: $(_TEST_OPTS)) $(info log-file: test-$(TEST_SUFFIX).log) $(_TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log - ! egrep "(--- FAIL:|leak)" -A10 -B50 test-$(TEST_SUFFIX).log + ! egrep "(--- FAIL:|leak|panic: test timed out)" -A10 -B50 test-$(TEST_SUFFIX).log docker-test: $(info GO_VERSION: $(_GO_VERSION)) @@ -105,7 +105,7 @@ docker-test: --volume=`pwd`:/go/src/github.com/coreos/etcd \ gcr.io/etcd-development/etcd-test:go$(_GO_VERSION) \ /bin/bash -c "$(_TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log" - ! egrep "(--- FAIL:|leak)" -A10 -B50 test-$(TEST_SUFFIX).log + ! egrep "(--- FAIL:|leak|panic: test timed out)" -A10 -B50 test-$(TEST_SUFFIX).log docker-test-coverage: $(info GO_VERSION: $(_GO_VERSION)) @@ -115,7 +115,7 @@ docker-test-coverage: --volume=`pwd`:/go/src/github.com/coreos/etcd \ gcr.io/etcd-development/etcd-test:go$(_GO_VERSION) \ /bin/bash -c "COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee docker-test-coverage-$(TEST_SUFFIX).log && /codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1" - ! egrep "(--- FAIL:|leak)" -A10 -B50 docker-test-coverage-$(TEST_SUFFIX).log + ! egrep "(--- FAIL:|leak|panic: test timed out)" -A10 -B50 docker-test-coverage-$(TEST_SUFFIX).log # build release container image with Linux _ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")