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 #5976 from heyitsanthony/fix-kadc

Browse Source 
integration: drain keepalives in TestLeaseKeepAliveCloseAfterDisconnectRevoke
This commit is contained in:
Anthony Romano 2016-07-18 20:21:44 -07:00 committed by GitHub
commit fcc96c9ebd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clientv3/integration/lease_test.go
View File

@ -359,7 +359,8 @@ func TestLeaseKeepAliveCloseAfterDisconnectRevoke(t *testing.T) {
if kerr != nil { if kerr != nil {
t.Fatal(kerr) t.Fatal(kerr)
} }
if kresp := <-rc; kresp.ID != resp.ID { kresp := <-rc
if kresp.ID != resp.ID {
t.Fatalf("ID = %x, want %x", kresp.ID, resp.ID) t.Fatalf("ID = %x, want %x", kresp.ID, resp.ID)
} }
@ -374,14 +375,15 @@ func TestLeaseKeepAliveCloseAfterDisconnectRevoke(t *testing.T) {
clus.Members[0].Restart(t) clus.Members[0].Restart(t)
// some keep-alives may still be buffered; drain until close
timer := time.After(time.Duration(kresp.TTL) * time.Second)
for kresp != nil {
select { select {
case ka, ok := <-rc: case kresp = <-rc:
if ok { case <-timer:
t.Fatalf("unexpected keepalive %v", ka)
}
case <-time.After(5 * time.Second):
t.Fatalf("keepalive channel did not close") t.Fatalf("keepalive channel did not close")
} }
}
} }
// TestLeaseKeepAliveInitTimeout ensures the keep alive channel closes if // TestLeaseKeepAliveInitTimeout ensures the keep alive channel closes if