mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integration: use WaitResponse for watch tests

Browse Source
This commit is contained in:
Gyu-Ho Lee
2016-01-17 14:11:30 -08:00
parent 98dfdebf13
commit f9b505ae56
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
integration/v3_grpc_test.go
View File

@ -412,20 +412,9 @@ func TestV3WatchFromCurrentRevision(t *testing.T) {
} }
} }
rCh := make(chan *pb.WatchResponse) rok, nr := WaitResponse(wStream, 1*time.Second)
go func() { if !rok {
resp, _ := wStream.Recv() t.Errorf("unexpected pb.WatchResponse is received %+v", nr)
rCh <- resp
}()
select {
case nr := <-rCh:
t.Errorf("#%d: unexpected response is received %+v", i, nr)
case <-time.After(2 * time.Second):
}
wStream.CloseSend()
rv, ok := <-rCh
if rv != nil || !ok {
t.Errorf("#%d: rv, ok got = %v %v, want = nil true", i, rv, ok)
} }
// can't defer because tcp ports will be in use // can't defer because tcp ports will be in use
@ -473,20 +462,9 @@ func TestV3WatchCancel(t *testing.T) {
} }
// watch got canceled, so this should block // watch got canceled, so this should block
rCh := make(chan *pb.WatchResponse) rok, nr := WaitResponse(wStream, 1*time.Second)
go func() { if !rok {
resp, _ := wStream.Recv() t.Errorf("unexpected pb.WatchResponse is received %+v", nr)
rCh <- resp
}()
select {
case nr := <-rCh:
t.Errorf("unexpected response is received %+v", nr)
case <-time.After(2 * time.Second):
}
wStream.CloseSend()
rv, ok := <-rCh
if rv != nil || !ok {
t.Errorf("rv, ok got = %v %v, want = nil true", rv, ok)
} }
clus.Terminate(t) clus.Terminate(t)