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

Merge pull request #3644 from mitake/test-race

Browse Source 
etcdserver, test: don't access testing.T in time.AfterFunc()'s own go…
This commit is contained in:
Yicheng Qin 2015-10-07 08:34:58 -07:00
commit f74ff9b867
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
etcdserver/server_test.go
View File

@ -604,11 +604,18 @@ func TestSync(t *testing.T) {
reqIDGen: idutil.NewGenerator(0, time.Time{}),
}
// check that sync is non-blocking
timer := time.AfterFunc(time.Second, func() {
t.Fatalf("sync should be non-blocking but did not return after 1s!")
})
srv.sync(10 * time.Second)
timer.Stop()
done := make(chan struct{})
go func() {
srv.sync(10 * time.Second)
done <- struct{}{}
}()
select {
case <-done:
case <-time.After(time.Second):
t.Fatal("sync should be non-blocking but did not return after 1s!")
}
testutil.WaitSchedule()
action := n.Action()
@ -637,11 +644,17 @@ func TestSyncTimeout(t *testing.T) {
reqIDGen: idutil.NewGenerator(0, time.Time{}),
}
// check that sync is non-blocking
timer := time.AfterFunc(time.Second, func() {
t.Fatalf("sync should be non-blocking but did not return after 1s!")
})
srv.sync(0)
timer.Stop()
done := make(chan struct{})
go func() {
srv.sync(0)
done <- struct{}{}
}()
select {
case <-done:
case <-time.After(time.Second):
t.Fatal("sync should be non-blocking but did not return after 1s!")
}
// give time for goroutine in sync to cancel
testutil.WaitSchedule()