From 476857523539e5bea2a4de4858a079365f395ae7 Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Wed, 20 Sep 2017 09:30:13 -0700
Subject: [PATCH] Fix format error on travis (#1527)

---
 go17.go                     |  3 ++-
 transport/transport_test.go | 14 ++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/go17.go b/go17.go
index a3421d99..de23098e 100644
--- a/go17.go
+++ b/go17.go
@@ -22,6 +22,7 @@ package grpc
 
 import (
 	"context"
+	"fmt"
 	"io"
 	"net"
 	"net/http"
@@ -41,7 +42,7 @@ func dialContext(ctx context.Context, network, address string) (net.Conn, error)
 func sendHTTPRequest(ctx context.Context, req *http.Request, conn net.Conn) error {
 	req = req.WithContext(ctx)
 	if err := req.Write(conn); err != nil {
-		return err
+		return fmt.Errorf("failed to write the HTTP request: %v", err)
 	}
 	return nil
 }
diff --git a/transport/transport_test.go b/transport/transport_test.go
index 0719b522..1d12b172 100644
--- a/transport/transport_test.go
+++ b/transport/transport_test.go
@@ -1932,15 +1932,12 @@ func writeOneHeader(framer *http2.Framer, sid uint32, httpStatus int) error {
 	var buf bytes.Buffer
 	henc := hpack.NewEncoder(&buf)
 	henc.WriteField(hpack.HeaderField{Name: ":status", Value: fmt.Sprint(httpStatus)})
-	if err := framer.WriteHeaders(http2.HeadersFrameParam{
+	return framer.WriteHeaders(http2.HeadersFrameParam{
 		StreamID:      sid,
 		BlockFragment: buf.Bytes(),
 		EndStream:     true,
 		EndHeaders:    true,
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
 }
 
 func writeTwoHeaders(framer *http2.Framer, sid uint32, httpStatus int) error {
@@ -1962,15 +1959,12 @@ func writeTwoHeaders(framer *http2.Framer, sid uint32, httpStatus int) error {
 		Name:  ":status",
 		Value: fmt.Sprint(httpStatus),
 	})
-	if err := framer.WriteHeaders(http2.HeadersFrameParam{
+	return framer.WriteHeaders(http2.HeadersFrameParam{
 		StreamID:      sid,
 		BlockFragment: buf.Bytes(),
 		EndStream:     true,
 		EndHeaders:    true,
-	}); err != nil {
-		return err
-	}
-	return nil
+	})
 }
 
 type httpServer struct {