From: Dmitriy Vyukov <dvyukov@google.com>
Date: Fri, 2 Nov 2012 20:26:36 +0000 (+0400)
Subject: net/http: fix data race in test
X-Git-Tag: go1.1rc2~1969
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=600de1fb3db279be87f4b9fab0a09463fe1568e1;p=gostls13.git

net/http: fix data race in test
The issue is that server still sends body,
when client closes the fd.
Fixes #4329.

R=golang-dev, dave, rsc
CC=golang-dev
https://golang.org/cl/6822072
---

diff --git a/src/pkg/net/http/fs_test.go b/src/pkg/net/http/fs_test.go
index 7c7015c297..ebe34dbcbf 100644
--- a/src/pkg/net/http/fs_test.go
+++ b/src/pkg/net/http/fs_test.go
@@ -648,6 +648,8 @@ func TestServeContent(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
 		if res.StatusCode != tt.wantStatus {
 			t.Errorf("test %q: status = %d; want %d", testName, res.StatusCode, tt.wantStatus)
 		}