Commit 9622f503 authored by Mikio Hara's avatar Mikio Hara

net: fix timeout tests

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7003049
parent 4d3cbfde
...@@ -60,8 +60,15 @@ func TestAcceptTimeout(t *testing.T) { ...@@ -60,8 +60,15 @@ func TestAcceptTimeout(t *testing.T) {
default: default:
} }
ln.Close() ln.Close()
if err := <-errc; err.(*OpError).Err != errClosing { switch nerr := <-errc; err := nerr.(type) {
t.Fatalf("Accept: expected err %v, got %v", errClosing, err.(*OpError).Err) 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) { ...@@ -109,8 +116,15 @@ func TestReadTimeout(t *testing.T) {
default: default:
} }
c.Close() c.Close()
if err := <-errc; err.(*OpError).Err != errClosing { switch nerr := <-errc; err := nerr.(type) {
t.Fatalf("Read: expected err %v, got %v", errClosing, err.(*OpError).Err) 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) { ...@@ -164,8 +178,15 @@ func TestWriteTimeout(t *testing.T) {
default: default:
} }
c.Close() c.Close()
if err := <-errc; err.(*OpError).Err != errClosing { switch nerr := <-errc; err := nerr.(type) {
t.Fatalf("Write: expected err %v, got %v", errClosing, err.(*OpError).Err) 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)
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment