astelm
/
grpcurl
mirror of https://github.com/fullstorydev/grpcurl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix CI tests to work with go 1.6; add another error message that was observed in CI

This commit is contained in:
Josh Humphries 2017-12-13 15:29:08 -05:00
parent 6c05311fb9
commit 91fb94b700
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grpcurl.go
View File

@ -871,7 +871,7 @@ func BlockingDial(ctx context.Context, address string, creds credentials.Transpo
once.Do(func() { wg.Done() }) once.Do(func() { wg.Done() })
ctx, cancel := context.WithTimeout(ctx, timeout) ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel() defer cancel()
conn, err := (&net.Dialer{}).DialContext(ctx, "tcp", address) conn, err := (&net.Dialer{Cancel: ctx.Done()}).Dial("tcp", address)
if err != nil { if err != nil {
writeResult(err) writeResult(err)
return nil, err return nil, err

3
tls_settings_test.go
View File

@ -126,7 +126,8 @@ func TestBrokenTLS_ClientPlainText(t *testing.T) {
if !strings.Contains(err.Error(), "transport is closing") && if !strings.Contains(err.Error(), "transport is closing") &&
!strings.Contains(err.Error(), "connection is unavailable") && !strings.Contains(err.Error(), "connection is unavailable") &&
!strings.Contains(err.Error(), "use of closed network connection") && !strings.Contains(err.Error(), "use of closed network connection") &&
!strings.Contains(err.Error(), "all SubConns are in TransientFailure") { !strings.Contains(err.Error(), "all SubConns are in TransientFailure") &&
!strings.Contains(err.Error(), "deadline exceeded") {
t.Fatalf("expecting transport failure, got: %v", err) t.Fatalf("expecting transport failure, got: %v", err)
} }