make the test failure consistent

This commit is contained in:
iamqizhao
2016-08-24 11:02:18 -07:00
parent 7873a050d4
commit 9dbd95fe38

View File

@ -298,13 +298,15 @@ func DialContext(ctx context.Context, target string, opts ...DialOption) (*Clien
case <-ctx.Done():
return nil, ctx.Err()
case err := <-waitC:
select {
case <-ctx.Done():
return nil, ctx.Err()
default:
}
if err != nil {
cc.Close()
return nil, err
}
case <-cc.ctx.Done():
cc.Close()
return nil, cc.ctx.Err()
case <-timeoutCh:
cc.Close()
return nil, ErrClientConnTimeout