chore: set extended timeout only for `protocol` package
It mitigates #4585 until the root cause is fixed.
This commit is contained in:
parent
7c9977b780
commit
e29332a374
1
Makefile
1
Makefile
|
@ -323,6 +323,7 @@ test-unit: export UNIT_TEST_PACKAGES ?= $(shell go list ./... | \
|
||||||
grep -v /t/benchmarks | \
|
grep -v /t/benchmarks | \
|
||||||
grep -v /transactions/fake | \
|
grep -v /transactions/fake | \
|
||||||
grep -E -v '/wakuv2(/.*|$$)')
|
grep -E -v '/wakuv2(/.*|$$)')
|
||||||
|
test-unit: export UNIT_TEST_PACKAGES_WITH_EXTENDED_TIMEOUT ?= github.com/status-im/status-go/protocol
|
||||||
test-unit: ##@tests Run unit and integration tests
|
test-unit: ##@tests Run unit and integration tests
|
||||||
./_assets/scripts/run_unit_tests.sh
|
./_assets/scripts/run_unit_tests.sh
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,8 @@ if [[ -z "${UNIT_TEST_COUNT}" ]]; then
|
||||||
UNIT_TEST_COUNT=1
|
UNIT_TEST_COUNT=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
UNIT_TEST_PACKAGE_TIMEOUT="$((UNIT_TEST_COUNT * 30))m"
|
UNIT_TEST_PACKAGE_TIMEOUT="$((UNIT_TEST_COUNT * 2))m"
|
||||||
|
UNIT_TEST_PACKAGE_TIMEOUT_EXTENDED="$((UNIT_TEST_COUNT * 30))m"
|
||||||
|
|
||||||
redirect_stdout() {
|
redirect_stdout() {
|
||||||
output_file=$1
|
output_file=$1
|
||||||
|
@ -26,6 +27,16 @@ redirect_stdout() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
has_extended_timeout() {
|
||||||
|
local package
|
||||||
|
for package in ${UNIT_TEST_PACKAGES_WITH_EXTENDED_TIMEOUT}; do
|
||||||
|
if [[ "$1" == "${package}" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
last_failing_exit_code=0
|
last_failing_exit_code=0
|
||||||
|
|
||||||
for package in ${UNIT_TEST_PACKAGES}; do
|
for package in ${UNIT_TEST_PACKAGES}; do
|
||||||
|
@ -33,8 +44,14 @@ for package in ${UNIT_TEST_PACKAGES}; do
|
||||||
package_dir=$(go list -f "{{.Dir}}" "${package}")
|
package_dir=$(go list -f "{{.Dir}}" "${package}")
|
||||||
output_file=${package_dir}/test.log
|
output_file=${package_dir}/test.log
|
||||||
|
|
||||||
|
if has_extended_timeout "${package}"; then
|
||||||
|
package_timeout="${UNIT_TEST_PACKAGE_TIMEOUT_EXTENDED}"
|
||||||
|
else
|
||||||
|
package_timeout="${UNIT_TEST_PACKAGE_TIMEOUT}"
|
||||||
|
fi
|
||||||
|
|
||||||
go test "${package}" -v ${GOTEST_EXTRAFLAGS} \
|
go test "${package}" -v ${GOTEST_EXTRAFLAGS} \
|
||||||
-timeout "${UNIT_TEST_PACKAGE_TIMEOUT}" \
|
-timeout "${package_timeout}" \
|
||||||
-count "${UNIT_TEST_COUNT}" \
|
-count "${UNIT_TEST_COUNT}" \
|
||||||
-tags "${BUILD_TAGS}" | \
|
-tags "${BUILD_TAGS}" | \
|
||||||
redirect_stdout "${output_file}"
|
redirect_stdout "${output_file}"
|
||||||
|
|
Loading…
Reference in New Issue