From 1e4a358454987ef5104e45081c8e2ecdc9f32513 Mon Sep 17 00:00:00 2001 From: Constantin Konstantinidis Date: Fri, 1 Nov 2019 15:46:47 +0100 Subject: [PATCH] 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 Reviewed-by: Brad Fitzpatrick --- src/net/http/main_test.go | 2 +- src/net/http/transport_test.go | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/net/http/main_test.go b/src/net/http/main_test.go index 7936fb3044..85aa9096c3 100644 --- a/src/net/http/main_test.go +++ b/src/net/http/main_test.go @@ -122,7 +122,7 @@ func afterTest(t testing.TB) { ").noteClientGone(": "a closenotifier sender", } var stacks string - for i := 0; i < 4; i++ { + for i := 0; i < 10; i++ { bad = "" stacks = strings.Join(interestingGoroutines(), "\n\n") for substr, what := range badSubstring { diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go index 0d63e46d4f..00d6b2608b 100644 --- a/src/net/http/transport_test.go +++ b/src/net/http/transport_test.go @@ -22,7 +22,6 @@ import ( "fmt" "go/token" "internal/nettrace" - "internal/testenv" "io" "io/ioutil" "log" @@ -2355,9 +2354,6 @@ func TestCancelRequestWithChannel(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) } func TestCancelRequestWithChannelBeforeDo_Context(t *testing.T) { -- 2.50.0