From 91fb94b700010ef9563645ae5a277ec083dd9258 Mon Sep 17 00:00:00 2001 From: Josh Humphries Date: Wed, 13 Dec 2017 15:29:08 -0500 Subject: [PATCH] fix CI tests to work with go 1.6; add another error message that was observed in CI --- grpcurl.go | 2 +- tls_settings_test.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/grpcurl.go b/grpcurl.go index 1112e1c..eb0cf00 100644 --- a/grpcurl.go +++ b/grpcurl.go @@ -871,7 +871,7 @@ func BlockingDial(ctx context.Context, address string, creds credentials.Transpo once.Do(func() { wg.Done() }) ctx, cancel := context.WithTimeout(ctx, timeout) defer cancel() - conn, err := (&net.Dialer{}).DialContext(ctx, "tcp", address) + conn, err := (&net.Dialer{Cancel: ctx.Done()}).Dial("tcp", address) if err != nil { writeResult(err) return nil, err diff --git a/tls_settings_test.go b/tls_settings_test.go index f396f8f..7c24efc 100644 --- a/tls_settings_test.go +++ b/tls_settings_test.go @@ -126,7 +126,8 @@ func TestBrokenTLS_ClientPlainText(t *testing.T) { if !strings.Contains(err.Error(), "transport is closing") && !strings.Contains(err.Error(), "connection is unavailable") && !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) }