Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

integration: fix a data race about i and tt in TestV3WatchFromCur… #10904

Merged
merged 1 commit into from
Jul 20, 2019
Merged

integration: fix a data race about i and tt in TestV3WatchFromCur… #10904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions integration/v3_watch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -253,6 +254,7 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
t.Errorf("#%d: couldn't put key (%v)", i, err)
}
}
ch <- struct{}{}
}()

// check stream results
Expand Down Expand Up @@ -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)
}
Expand Down