From: Rémy Oudompheng <oudomphe@phare.normalesup.org>
Date: Thu, 1 Nov 2012 19:52:30 +0000 (+0100)
Subject: net: fix race in TestReadWriteDeadline.
X-Git-Tag: go1.1rc2~1983
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=824b332652b94fea18d1e6cc42e75870b0185f5e;p=gostls13.git

net: fix race in TestReadWriteDeadline.

Discovered by adding OBLOCK support to race
instrumentation.

R=golang-dev, minux.ma, rsc
CC=golang-dev
https://golang.org/cl/6819067
---

diff --git a/src/pkg/net/timeout_test.go b/src/pkg/net/timeout_test.go
index 3343c4a551..f6f92409df 100644
--- a/src/pkg/net/timeout_test.go
+++ b/src/pkg/net/timeout_test.go
@@ -201,7 +201,7 @@ func TestReadWriteDeadline(t *testing.T) {
 
 	go func() {
 		var buf [10]byte
-		_, err = c.Read(buf[:])
+		_, err := c.Read(buf[:])
 		if err == nil {
 			t.Errorf("Read should not succeed")
 		}
@@ -212,7 +212,7 @@ func TestReadWriteDeadline(t *testing.T) {
 	go func() {
 		var buf [10000]byte
 		for {
-			_, err = c.Write(buf[:])
+			_, err := c.Write(buf[:])
 			if err != nil {
 				break
 			}