1
0
mirror of https://github.com/golang/go synced 2024-09-30 12:28:35 -06:00

net/http: deflake TestCancelRequestWithChannelBeforeDo_Cancel

Goroutines clean up takes longer when using deprecated CloseNotifier.

Fixes #35122

Change-Id: Id820a3012b5c781ddfb294b38ee3b009624e398c
Reviewed-on: https://go-review.googlesource.com/c/go/+/204661
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Constantin Konstantinidis 2019-11-01 15:46:47 +01:00 committed by Brad Fitzpatrick
parent dc39be8b85
commit 1e4a358454
2 changed files with 1 additions and 5 deletions

View File

@ -122,7 +122,7 @@ func afterTest(t testing.TB) {
").noteClientGone(": "a closenotifier sender", ").noteClientGone(": "a closenotifier sender",
} }
var stacks string var stacks string
for i := 0; i < 4; i++ { for i := 0; i < 10; i++ {
bad = "" bad = ""
stacks = strings.Join(interestingGoroutines(), "\n\n") stacks = strings.Join(interestingGoroutines(), "\n\n")
for substr, what := range badSubstring { for substr, what := range badSubstring {

View File

@ -22,7 +22,6 @@ import (
"fmt" "fmt"
"go/token" "go/token"
"internal/nettrace" "internal/nettrace"
"internal/testenv"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
@ -2355,9 +2354,6 @@ func TestCancelRequestWithChannel(t *testing.T) {
} }
func TestCancelRequestWithChannelBeforeDo_Cancel(t *testing.T) { func TestCancelRequestWithChannelBeforeDo_Cancel(t *testing.T) {
if os.Getenv("GO_BUILDER_NAME") == "windows-amd64-longtest" {
testenv.SkipFlaky(t, 35122)
}
testCancelRequestWithChannelBeforeDo(t, false) testCancelRequestWithChannelBeforeDo(t, false)
} }
func TestCancelRequestWithChannelBeforeDo_Context(t *testing.T) { func TestCancelRequestWithChannelBeforeDo_Context(t *testing.T) {