Merge pull request #10904 from yuzeming/fixed-10899

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

View File

@ -245,6 +245,7 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
}
// asynchronously create keys
ch := make(chan struct{}, 1)
go func() {
for _, k := range tt.putKeys {
kvc := toGRPC(clus.RandClient()).KV
@ -253,6 +254,7 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
t.Errorf("#%d: couldn't put key (%v)", i, err)
}
}
ch <- struct{}{}
}()
// check stream results
@ -286,6 +288,9 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
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
clus.Terminate(t)
}