Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

net: fix flaky *TimeoutMustNotReturn tests

Browse source 
The tester goroutine doesn't always gets a chance to run before the
timeout expires. Wait for the goroutine to start and set deadlines
before staring the timer.

Fixes #36796

Change-Id: Iffed6259de31340c3f66e34da473826a1d09fcde
Reviewed-on: https://go-review.googlesource.com/c/go/+/412858
Reviewed-by: Damien Neil <dneil@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
Reviewed-by: Bryan Mills <bcmills@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
This commit is contained in:
Dmitri Goutnik 2022-06-17 12:10:09 -05:00 • committed by Damien Neil
parent 6c25ba624f
commit dd2d00f9d5
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/net/timeout_test.go
View file

@ -243,8 +243,7 @@ func TestAcceptTimeoutMustNotReturn(t *testing.T) {
ln := newLocalListener(t, "tcp") ln := newLocalListener(t, "tcp")
defer ln.Close() defer ln.Close()
max := time.NewTimer(100 * time.Millisecond) maxch := make(chan *time.Timer)
defer max.Stop()
ch := make(chan error) ch := make(chan error)
go func() { go func() {
if err := ln.(*TCPListener).SetDeadline(time.Now().Add(-5 * time.Second)); err != nil { if err := ln.(*TCPListener).SetDeadline(time.Now().Add(-5 * time.Second)); err != nil {
@ -253,10 +252,14 @@ func TestAcceptTimeoutMustNotReturn(t *testing.T) {
if err := ln.(*TCPListener).SetDeadline(noDeadline); err != nil { if err := ln.(*TCPListener).SetDeadline(noDeadline); err != nil {
t.Error(err) t.Error(err)
} }
maxch <- time.NewTimer(100 * time.Millisecond)
_, err := ln.Accept() _, err := ln.Accept()
ch <- err ch <- err
}() }()
max := <-maxch
defer max.Stop()
select { select {
case err := <-ch: case err := <-ch:
if perr := parseAcceptError(err); perr != nil { if perr := parseAcceptError(err); perr != nil {
@ -348,8 +351,7 @@ func TestReadTimeoutMustNotReturn(t *testing.T) {
} }
defer c.Close() defer c.Close()
max := time.NewTimer(100 * time.Millisecond) maxch := make(chan *time.Timer)
defer max.Stop()
ch := make(chan error) ch := make(chan error)
go func() { go func() {
if err := c.SetDeadline(time.Now().Add(-5 * time.Second)); err != nil { if err := c.SetDeadline(time.Now().Add(-5 * time.Second)); err != nil {
@ -361,11 +363,15 @@ func TestReadTimeoutMustNotReturn(t *testing.T) {
if err := c.SetReadDeadline(noDeadline); err != nil { if err := c.SetReadDeadline(noDeadline); err != nil {
t.Error(err) t.Error(err)
} }
maxch <- time.NewTimer(100 * time.Millisecond)
var b [1]byte var b [1]byte
_, err := c.Read(b[:]) _, err := c.Read(b[:])
ch <- err ch <- err
}() }()
max := <-maxch
defer max.Stop()
select { select {
case err := <-ch: case err := <-ch:
if perr := parseReadError(err); perr != nil { if perr := parseReadError(err); perr != nil {
@ -517,8 +523,7 @@ func TestWriteTimeoutMustNotReturn(t *testing.T) {
} }
defer c.Close() defer c.Close()
max := time.NewTimer(100 * time.Millisecond) maxch := make(chan *time.Timer)
defer max.Stop()
ch := make(chan error) ch := make(chan error)
go func() { go func() {
if err := c.SetDeadline(time.Now().Add(-5 * time.Second)); err != nil { if err := c.SetDeadline(time.Now().Add(-5 * time.Second)); err != nil {
@ -530,6 +535,7 @@ func TestWriteTimeoutMustNotReturn(t *testing.T) {
if err := c.SetWriteDeadline(noDeadline); err != nil { if err := c.SetWriteDeadline(noDeadline); err != nil {
t.Error(err) t.Error(err)
} }
maxch <- time.NewTimer(100 * time.Millisecond)
var b [1]byte var b [1]byte
for { for {
if _, err := c.Write(b[:]); err != nil { if _, err := c.Write(b[:]); err != nil {
@ -539,6 +545,9 @@ func TestWriteTimeoutMustNotReturn(t *testing.T) {
} }
}() }()
max := <-maxch
defer max.Stop()
select { select {
case err := <-ch: case err := <-ch:
if perr := parseWriteError(err); perr != nil { if perr := parseWriteError(err); perr != nil {