net/http: fix data race in test

Fixes #2712.

R=golang-dev, dsymonds
CC=golang-dev, mpimenov
https://golang.org/cl/5543062

diff --git a/src/pkg/net/http/fs_test.go b/src/pkg/net/http/fs_test.go
index 976ee75c7dd0710a1b6a99afcc5ab1935d14df57..8abd337cad81a00037dc9e10155358706749df8f 100644 (file)
--- a/src/pkg/net/http/fs_test.go
+++ b/src/pkg/net/http/fs_test.go
@@ -224,9 +224,9 @@ func TestEmptyDirOpenCWD(t *testing.T) {
 
 func TestServeFileContentType(t *testing.T) {
        const ctype = "icecream/chocolate"
-       override := false
+       override := make(chan bool, 1)
        ts := httptest.NewServer(HandlerFunc(func(w ResponseWriter, r *Request) {
-               if override {
+               if <-override {
                        w.Header().Set("Content-Type", ctype)
                }
                ServeFile(w, r, "testdata/file")
@@ -241,8 +241,9 @@ func TestServeFileContentType(t *testing.T) {
                        t.Errorf("Content-Type mismatch: got %q, want %q", h, want)
                }
        }
+       override <- false
        get("text/plain; charset=utf-8")
-       override = true
+       override <- true
        get(ctype)
 }