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 #6007 from heyitsanthony/fix-watch-test

Browse Source 
integration: fix race in TestV3WatchMultipleEventsTxnSynced
This commit is contained in:
Anthony Romano 2016-07-20 10:34:54 -07:00 committed by GitHub
commit a7b098b26d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
integration/v3_watch_test.go
View File

@ -672,6 +672,9 @@ func testV3WatchMultipleEventsTxn(t *testing.T, startRev int64) {
if err := wStream.Send(wreq); err != nil { if err := wStream.Send(wreq); err != nil {
t.Fatalf("wStream.Send error: %v", err) t.Fatalf("wStream.Send error: %v", err)
} }
if resp, err := wStream.Recv(); err != nil || resp.Created == false {
t.Fatalf("create response failed: resp=%v, err=%v", resp, err)
}
kvc := toGRPC(clus.RandClient()).KV kvc := toGRPC(clus.RandClient()).KV
txn := pb.TxnRequest{} txn := pb.TxnRequest{}
@ -697,9 +700,6 @@ func testV3WatchMultipleEventsTxn(t *testing.T, startRev int64) {
if err != nil { if err != nil {
t.Errorf("wStream.Recv error: %v", err) t.Errorf("wStream.Recv error: %v", err)
} }
if resp.Created {
continue
}
events = append(events, resp.Events...) events = append(events, resp.Events...)
} }
sort.Sort(eventsSortByKey(events)) sort.Sort(eventsSortByKey(events))