From: Mikio Hara <mikioh.mikioh@gmail.com>
Date: Sat, 22 Dec 2012 05:56:02 +0000 (+0900)
Subject: net: fix timeout tests
X-Git-Tag: go1.1rc2~1564
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9622f5032e67561c822374714aceb779389c3c00;p=gostls13.git

net: fix timeout tests

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

diff --git a/src/pkg/net/timeout_test.go b/src/pkg/net/timeout_test.go
index 21223cc74a..cda2fd73c6 100644
--- a/src/pkg/net/timeout_test.go
+++ b/src/pkg/net/timeout_test.go
@@ -60,8 +60,15 @@ func TestAcceptTimeout(t *testing.T) {
 	default:
 	}
 	ln.Close()
-	if err := <-errc; err.(*OpError).Err != errClosing {
-		t.Fatalf("Accept: expected err %v, got %v", errClosing, err.(*OpError).Err)
+	switch nerr := <-errc; err := nerr.(type) {
+	case *OpError:
+		if err.Err != errClosing {
+			t.Fatalf("Accept: expected err %v, got %v", errClosing, err)
+		}
+	default:
+		if err != errClosing {
+			t.Fatalf("Accept: expected err %v, got %v", errClosing, err)
+		}
 	}
 }
 
@@ -109,8 +116,15 @@ func TestReadTimeout(t *testing.T) {
 	default:
 	}
 	c.Close()
-	if err := <-errc; err.(*OpError).Err != errClosing {
-		t.Fatalf("Read: expected err %v, got %v", errClosing, err.(*OpError).Err)
+	switch nerr := <-errc; err := nerr.(type) {
+	case *OpError:
+		if err.Err != errClosing {
+			t.Fatalf("Read: expected err %v, got %v", errClosing, err)
+		}
+	default:
+		if err != errClosing {
+			t.Fatalf("Read: expected err %v, got %v", errClosing, err)
+		}
 	}
 }
 
@@ -164,8 +178,15 @@ func TestWriteTimeout(t *testing.T) {
 	default:
 	}
 	c.Close()
-	if err := <-errc; err.(*OpError).Err != errClosing {
-		t.Fatalf("Write: expected err %v, got %v", errClosing, err.(*OpError).Err)
+	switch nerr := <-errc; err := nerr.(type) {
+	case *OpError:
+		if err.Err != errClosing {
+			t.Fatalf("Write: expected err %v, got %v", errClosing, err)
+		}
+	default:
+		if err != errClosing {
+			t.Fatalf("Write: expected err %v, got %v", errClosing, err)
+		}
 	}
 }