diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index f13eb5e85..504ef962c 100644 --- a/pkg/testutil/leak.go +++ b/pkg/testutil/leak.go @@ -126,7 +126,7 @@ func interestingGoroutines() (gs []string) { strings.Contains(stack, "created by text/template/parse.lex") || strings.Contains(stack, "runtime.MHeap_Scavenger") || strings.Contains(stack, "rcrypto/internal/boring.(*PublicKeyRSA).finalize") || - strings.Contains(stack, "net.(*netFD).Close(...)") { + strings.Contains(stack, "net.(*netFD).Close(") { continue } gs = append(gs, stack) diff --git a/test.sh b/test.sh index 7ffd7c58b..1a985653a 100755 --- a/test.sh +++ b/test.sh @@ -110,7 +110,7 @@ function integration_extra { function integration_pass { local pkgs=${USERPKG:-"./integration/..."} - run_for_module "tests" go_test "${pkgs}" "parallel" : -timeout="${TIMEOUT:-30m}" "${COMMON_TEST_FLAGS[@]}" "${RUN_ARG[@]}" "$@" || return $? + run_for_module "tests" go_test "${pkgs}" "parallel" : -timeout="${TIMEOUT:-15m}" "-v" "${COMMON_TEST_FLAGS[@]}" "${RUN_ARG[@]}" "$@" || return $? integration_extra "$@" }