Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

pkg/transport: fix a data race in TestWriteReadTimeoutListener

Browse Source
This commit is contained in:
Xiang Li 2015-09-25 10:02:37 -07:00
parent 385e17583f
commit 5d033c22af
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/transport/timeout_listener_test.go
View File

@ -68,18 +68,23 @@ func TestWriteReadTimeoutListener(t *testing.T) {
// fill the socket buffer
data := make([]byte, 5*1024*1024)
timer := time.AfterFunc(wln.wtimeoutd*5, func() {
t.Fatal("wait timeout")
})
defer timer.Stop()
done := make(chan struct{})
go func() {
_, err = conn.Write(data)
done <- struct{}{}
}()
select {
case <-done:
case <-time.After(wln.wtimeoutd * 5):
t.Fatal("wait timeout")
}
_, err = conn.Write(data)
if operr, ok := err.(*net.OpError); !ok || operr.Op != "write" || !operr.Timeout() {
t.Errorf("err = %v, want write i/o timeout error", err)
}
stop <- struct{}{}
timer.Reset(wln.rdtimeoutd * 5)
go blocker()
conn, err = wln.Accept()
@ -87,7 +92,18 @@ func TestWriteReadTimeoutListener(t *testing.T) {
t.Fatalf("unexpected accept error: %v", err)
}
buf := make([]byte, 10)
_, err = conn.Read(buf)
go func() {
_, err = conn.Read(buf)
done <- struct{}{}
}()
select {
case <-done:
case <-time.After(wln.rdtimeoutd * 5):
t.Fatal("wait timeout")
}
if operr, ok := err.(*net.OpError); !ok || operr.Op != "read" || !operr.Timeout() {
t.Errorf("err = %v, want write i/o timeout error", err)
}