aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2016-02-02 16:05:47 +0000
committerBrad Fitzpatrick <bradfitz@golang.org>2016-02-02 17:05:23 +0000
commiteb5bfa71717b30741f2a3e94a5669a3b55498ad4 (patch)
tree421028af09581ff60450bf37ba3bd63ce6e8f03a
parentb6c5edae7c0e9dd6d12dbb8f1c9638dea45f9464 (diff)
downloadgo-eb5bfa71717b30741f2a3e94a5669a3b55498ad4.tar.gz
go-eb5bfa71717b30741f2a3e94a5669a3b55498ad4.zip
net/http: mark TestTLSServerClosesConnection as flaky on all systems
Fixes #14195 Change-Id: I245b3ca3fd7d1a76aa95f2e058f8432ba5ce31ee Reviewed-on: https://go-review.googlesource.com/19160 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> Reviewed-by: Austin Clements <austin@google.com> Reviewed-by: Russ Cox <rsc@golang.org>
-rw-r--r--src/net/http/transport_test.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/net/http/transport_test.go b/src/net/http/transport_test.go
index 3b2a5f978e..8cb89a4220 100644
--- a/src/net/http/transport_test.go
+++ b/src/net/http/transport_test.go
@@ -2208,9 +2208,8 @@ func TestTransportTLSHandshakeTimeout(t *testing.T) {
// Trying to repro golang.org/issue/3514
func TestTLSServerClosesConnection(t *testing.T) {
defer afterTest(t)
- if runtime.GOOS == "windows" {
- t.Skip("skipping flaky test on Windows; golang.org/issue/7634")
- }
+ setFlaky(t, 7634)
+
closedc := make(chan bool, 1)
ts := httptest.NewTLSServer(HandlerFunc(func(w ResponseWriter, r *Request) {
if strings.Contains(r.URL.Path, "/keep-alive-then-die") {