net/http: fix racy test

We need to wait for the handler to actually finish running,
not almost be done running.

This was always a bug, but now that handler output is buffered
it shows up easily on GOMAXPROCS >1 systems.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/7109043

diff --git a/src/pkg/net/http/serve_test.go b/src/pkg/net/http/serve_test.go
index 96d442b6233b49d6410680d7fe340297ff40959b..853aac7f4d21c4c504680750af7efb9538020add 100644 (file)
--- a/src/pkg/net/http/serve_test.go
+++ b/src/pkg/net/http/serve_test.go
@@ -67,6 +67,7 @@ func (a dummyAddr) String() string {
 type testConn struct {
        readBuf  bytes.Buffer
        writeBuf bytes.Buffer
+       closec   chan bool // if non-nil, send value to it on close
 }
 
 func (c *testConn) Read(b []byte) (int, error) {
@@ -78,6 +79,10 @@ func (c *testConn) Write(b []byte) (int, error) {
 }
 
 func (c *testConn) Close() error {
+       select {
+       case c.closec <- true:
+       default:
+       }
        return nil
 }
 
@@ -788,12 +793,10 @@ func TestServerUnreadRequestBodyLarge(t *testing.T) {
                        "Content-Length: %d\r\n"+
                        "\r\n", len(body))))
        conn.readBuf.Write([]byte(body))
-
-       done := make(chan bool)
+       conn.closec = make(chan bool, 1)
 
        ls := &oneConnListener{conn}
        go Serve(ls, HandlerFunc(func(rw ResponseWriter, req *Request) {
-               defer close(done)
                if conn.readBuf.Len() < len(body)/2 {
                        t.Errorf("on request, read buffer length is %d; expected about 1MB", conn.readBuf.Len())
                }
@@ -803,7 +806,7 @@ func TestServerUnreadRequestBodyLarge(t *testing.T) {
                        t.Errorf("post-WriteHeader, read buffer length is %d; expected about 1MB", conn.readBuf.Len())
                }
        }))
-       <-done
+       <-conn.closec
 
        if res := conn.writeBuf.String(); !strings.Contains(res, "Connection: close") {
                t.Errorf("Expected a Connection: close header; got response: %s", res)
@@ -1150,16 +1153,15 @@ func TestClientWriteShutdown(t *testing.T) {
 func TestServerBufferedChunking(t *testing.T) {
        conn := new(testConn)
        conn.readBuf.Write([]byte("GET / HTTP/1.1\r\n\r\n"))
-       done := make(chan bool)
+       conn.closec = make(chan bool, 1)
        ls := &oneConnListener{conn}
        go Serve(ls, HandlerFunc(func(rw ResponseWriter, req *Request) {
-               defer close(done)
                rw.(Flusher).Flush() // force the Header to be sent, in chunking mode, not counting the length
                rw.Write([]byte{'x'})
                rw.Write([]byte{'y'})
                rw.Write([]byte{'z'})
        }))
-       <-done
+       <-conn.closec
        if !bytes.HasSuffix(conn.writeBuf.Bytes(), []byte("\r\n\r\n3\r\nxyz\r\n0\r\n\r\n")) {
                t.Errorf("response didn't end with a single 3 byte 'xyz' chunk; got:\n%q",
                        conn.writeBuf.Bytes())