mirror of https://github.com/golang/go.git
runtime/race: deflake test
The test sometimes fails on builders. The test uses sleeps to establish the necessary goroutine execution order. If sleeps undersleep/oversleep the race is still reported, but it can be reported when the main test goroutine returns. In such case test driver can't match the race with the test and reports failure. Wait for both test goroutines to ensure that the race is reported in the test scope. Fixes #15579 Change-Id: I0b9bec0ebfb0c127d83eb5325a7fe19ef9545050 Reviewed-on: https://go-review.googlesource.com/22951 Run-TryBot: Dmitry Vyukov <dvyukov@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
parent
87a2ae1fa2
commit
aeecee8ce4
|
|
@ -285,17 +285,20 @@ func TestRaceChanWrongClose(t *testing.T) {
|
|||
v1 := 0
|
||||
v2 := 0
|
||||
c := make(chan int, 1)
|
||||
done := make(chan bool)
|
||||
go func() {
|
||||
defer func() {
|
||||
recover()
|
||||
}()
|
||||
v1 = 1
|
||||
c <- 1
|
||||
done <- true
|
||||
}()
|
||||
go func() {
|
||||
time.Sleep(1e7)
|
||||
v2 = 2
|
||||
close(c)
|
||||
done <- true
|
||||
}()
|
||||
time.Sleep(2e7)
|
||||
if _, who := <-c; who {
|
||||
|
|
@ -303,6 +306,8 @@ func TestRaceChanWrongClose(t *testing.T) {
|
|||
} else {
|
||||
v1 = 2
|
||||
}
|
||||
<-done
|
||||
<-done
|
||||
}
|
||||
|
||||
func TestRaceChanSendClose(t *testing.T) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue