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 #10904 from yuzeming/fixed-10899

Browse Source 
integration: fix a data race about `i` and `tt` in TestV3WatchFromCur…
This commit is contained in:
Jingyi Hu 2019-07-19 17:51:21 -07:00 committed by GitHub
commit fe86a786a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
integration/v3_watch_test.go
View File

@ -245,6 +245,7 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
} }
// asynchronously create keys // asynchronously create keys
ch := make(chan struct{}, 1)
go func() { go func() {
for _, k := range tt.putKeys { for _, k := range tt.putKeys {
kvc := toGRPC(clus.RandClient()).KV kvc := toGRPC(clus.RandClient()).KV
@ -253,6 +254,7 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
t.Errorf("#%d: couldn't put key (%v)", i, err) t.Errorf("#%d: couldn't put key (%v)", i, err)
} }
} }
ch <- struct{}{}
}() }()
// check stream results // check stream results
@ -286,6 +288,9 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
t.Errorf("unexpected pb.WatchResponse is received %+v", nr) t.Errorf("unexpected pb.WatchResponse is received %+v", nr)
} }
// wait for the client to finish sending the keys before terminating the cluster
<-ch
// can't defer because tcp ports will be in use // can't defer because tcp ports will be in use
clus.Terminate(t) clus.Terminate(t)
} }