net/http: fix flaky TestServerValidatesHostHeader

Passes with go test -race -count=1000 -name=TestServerValidatesHostHeader now
without hanging.

Fixes #13950

Change-Id: I41c3a555c642595c95c8c52f19a05a4c68e67630
Reviewed-on: https://go-review.googlesource.com/18660
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 86f4b66389c9c9b76d445d4ca306bbac538d3562..f8cad802d4986a9293c533284c6ca59bc99a342c 100644 (file)
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -3827,7 +3827,7 @@ func TestServerValidatesHostHeader(t *testing.T) {
                {"HTTP/1.0", "Host: \xff\r\n", 400},
        }
        for _, tt := range tests {
-               conn := &testConn{closec: make(chan bool)}
+               conn := &testConn{closec: make(chan bool, 1)}
                io.WriteString(&conn.readBuf, "GET / "+tt.proto+"\r\n"+tt.host+"\r\n")
 
                ln := &oneConnListener{conn}
@@ -3867,7 +3867,7 @@ func TestServerValidatesHeaders(t *testing.T) {
                {"foo: foo\xfffoo\r\n", 200}, // non-ASCII high octets in value are fine
        }
        for _, tt := range tests {
-               conn := &testConn{closec: make(chan bool)}
+               conn := &testConn{closec: make(chan bool, 1)}
                io.WriteString(&conn.readBuf, "GET / HTTP/1.1\r\nHost: foo\r\n"+tt.header+"\r\n")
 
                ln := &oneConnListener{conn}