From: Rémy Oudompheng <oudomphe@phare.normalesup.org>
Date: Mon, 25 Mar 2013 07:17:10 +0000 (+0100)
Subject: net/http: deflake BenchmarkServerFakeConnNoKeepAlive.
X-Git-Tag: go1.1rc2~354
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=3add0fef1e7e398e73bd4a7bdcb278bef5683395;p=gostls13.git

net/http: deflake BenchmarkServerFakeConnNoKeepAlive.

Fixes #5121.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/7814046
---

diff --git a/src/pkg/net/http/serve_test.go b/src/pkg/net/http/serve_test.go
index 5adde545f8..6458455559 100644
--- a/src/pkg/net/http/serve_test.go
+++ b/src/pkg/net/http/serve_test.go
@@ -1635,7 +1635,9 @@ Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.3
 	res := []byte("Hello world!\n")
 
 	conn := &testConn{
-		closec: make(chan bool),
+		// testConn.Close will not push into the channel
+		// if it's full.
+		closec: make(chan bool, 1),
 	}
 	handler := HandlerFunc(func(rw ResponseWriter, r *Request) {
 		rw.Header().Set("Content-Type", "text/html; charset=utf-8")