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 #6594 from heyitsanthony/e2e-etcdctl-timeout

Browse Source 
e2e: print correct timeout for etcdctl tests
This commit is contained in:
Anthony Romano
2016-10-06 10:40:46 -07:00
committed by GitHub
parent fa1e28102e e28706d9e2
commit b8079b7fc0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e2e/ctl_v3_test.go
View File

@@ -144,11 +144,13 @@ func testCtl(t *testing.T, testFunc func(ctlCtx), opts ...ctlOption) {
testFunc(ret)
}()
timeout := 2*ret.dialTimeout + time.Second
if ret.dialTimeout == 0 {
timeout = 30 * time.Second
}
select {
case <-time.After(2*ret.dialTimeout + time.Second):
if ret.dialTimeout > 0 {
t.Fatalf("test timed out for %v", ret.dialTimeout)
}
case <-time.After(timeout):
t.Fatalf("test timed out after %v", timeout)
case <-donec:
}
}