opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix format error on travis (#1527)

Browse Source
This commit is contained in:
Menghan Li
2017-09-20 09:30:13 -07:00
committed by dfawley
parent dce316936b
commit 4768575235
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go17.go
View File

@ -22,6 +22,7 @@ package grpc
import ( import (
"context" "context"
"fmt"
"io" "io"
"net" "net"
"net/http" "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 { func sendHTTPRequest(ctx context.Context, req *http.Request, conn net.Conn) error {
req = req.WithContext(ctx) req = req.WithContext(ctx)
if err := req.Write(conn); err != nil { if err := req.Write(conn); err != nil {
return err return fmt.Errorf("failed to write the HTTP request: %v", err)
} }
return nil return nil
} }

14
transport/transport_test.go
View File

@ -1932,15 +1932,12 @@ func writeOneHeader(framer *http2.Framer, sid uint32, httpStatus int) error {
var buf bytes.Buffer var buf bytes.Buffer
henc := hpack.NewEncoder(&buf) henc := hpack.NewEncoder(&buf)
henc.WriteField(hpack.HeaderField{Name: ":status", Value: fmt.Sprint(httpStatus)}) henc.WriteField(hpack.HeaderField{Name: ":status", Value: fmt.Sprint(httpStatus)})
if err := framer.WriteHeaders(http2.HeadersFrameParam{ return framer.WriteHeaders(http2.HeadersFrameParam{
StreamID: sid, StreamID: sid,
BlockFragment: buf.Bytes(), BlockFragment: buf.Bytes(),
EndStream: true, EndStream: true,
EndHeaders: true, EndHeaders: true,
}); err != nil { })
return err
}
return nil
} }
func writeTwoHeaders(framer *http2.Framer, sid uint32, httpStatus int) error { 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", Name: ":status",
Value: fmt.Sprint(httpStatus), Value: fmt.Sprint(httpStatus),
}) })
if err := framer.WriteHeaders(http2.HeadersFrameParam{ return framer.WriteHeaders(http2.HeadersFrameParam{
StreamID: sid, StreamID: sid,
BlockFragment: buf.Bytes(), BlockFragment: buf.Bytes(),
EndStream: true, EndStream: true,
EndHeaders: true, EndHeaders: true,
}); err != nil { })
return err
}
return nil
} }
type httpServer struct { type httpServer struct {