From 9622f5032e67561c822374714aceb779389c3c00 Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Sat, 22 Dec 2012 14:56:02 +0900 Subject: [PATCH] net: fix timeout tests R=golang-dev, minux.ma CC=golang-dev https://golang.org/cl/7003049 --- src/pkg/net/timeout_test.go | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) 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) + } } } -- 2.48.1