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

Fix comments from github

Browse Source
This commit is contained in:
Noah Eisen
2016-11-09 15:14:48 -08:00
parent 86765df8f8
commit 2769b6cafd
2 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
interop/client/client.go
View File

@ -72,9 +72,9 @@ var (
cancel_after_begin: cancellation after metadata has been sent but before payloads are sent; cancel_after_begin: cancellation after metadata has been sent but before payloads are sent;
cancel_after_first_response: cancellation after receiving 1st message from the server; cancel_after_first_response: cancellation after receiving 1st message from the server;
status_code_and_message: status code propagated back to client; status_code_and_message: status code propagated back to client;
custom_metadata: server will echo custom metadata; custom_metadata: server will echo custom metadata;
unimplemented_method: client attempts to call unimplemented method; unimplemented_method: client attempts to call unimplemented method;
unimplemented_service: client attempts to call unimplemented service`) unimplemented_service: client attempts to call unimplemented service.`)
// The test CA root cert file // The test CA root cert file
testCAFile = "testdata/ca.pem" testCAFile = "testdata/ca.pem"
@ -191,7 +191,7 @@ func main() {
interop.DoCustomMetadata(tc) interop.DoCustomMetadata(tc)
grpclog.Println("CustomMetadata done") grpclog.Println("CustomMetadata done")
case "unimplemented_method": case "unimplemented_method":
interop.DoUnimplementedMethod(serverAddr) interop.DoUnimplementedMethod(conn)
grpclog.Println("UnimplementedMethod done") grpclog.Println("UnimplementedMethod done")
case "unimplemented_service": case "unimplemented_service":
interop.DoUnimplementedService(testpb.NewUnimplementedServiceClient(conn)) interop.DoUnimplementedService(testpb.NewUnimplementedServiceClient(conn))

58
interop/test_utils.go
View File

@ -480,9 +480,9 @@ func validateMetadata(header, trailer metadata.MD) {
} }
} }
// DoCustomMetadata checks that metadata is echoed back to the client // DoCustomMetadata checks that metadata is echoed back to the client.
func DoCustomMetadata(tc testpb.TestServiceClient) { func DoCustomMetadata(tc testpb.TestServiceClient) {
// Testing with UnaryCall // Testing with UnaryCall.
pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, 1) pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, 1)
req := &testpb.SimpleRequest{ req := &testpb.SimpleRequest{
ResponseType: testpb.PayloadType_COMPRESSABLE.Enum(), ResponseType: testpb.PayloadType_COMPRESSABLE.Enum(),
@ -507,7 +507,7 @@ func DoCustomMetadata(tc testpb.TestServiceClient) {
} }
validateMetadata(header, trailer) validateMetadata(header, trailer)
// Testing with FullDuplex // Testing with FullDuplex.
stream, err := tc.FullDuplexCall(ctx) stream, err := tc.FullDuplexCall(ctx)
if err != nil { if err != nil {
grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v, want <nil>", tc, err) grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v, want <nil>", tc, err)
@ -579,24 +579,16 @@ func DoStatusCodeAndMessage(tc testpb.TestServiceClient) {
// DoUnimplementedService attempts to call a method from an unimplemented service. // DoUnimplementedService attempts to call a method from an unimplemented service.
func DoUnimplementedService(tc testpb.UnimplementedServiceClient) { func DoUnimplementedService(tc testpb.UnimplementedServiceClient) {
var code int32 = 12
expectedCode := codes.Code(code)
_, err := tc.UnimplementedCall(context.Background(), &testpb.Empty{}) _, err := tc.UnimplementedCall(context.Background(), &testpb.Empty{})
if grpc.Code(err) != expectedCode { if grpc.Code(err) != codes.Unimplemented {
grpclog.Fatalf("%v.UnimplementedCall() = _, %v, want _, %v", tc, grpc.Code(err), expectedCode) grpclog.Fatalf("%v.UnimplementedCall() = _, %v, want _, %v", tc, grpc.Code(err), codes.Unimplemented)
} }
} }
// DoUnimplementedMethod attempts to call an unimplemented method. // DoUnimplementedMethod attempts to call an unimplemented method.
func DoUnimplementedMethod(serverAddr string) { func DoUnimplementedMethod(cc *grpc.ClientConn) {
cc, err := grpc.Dial(serverAddr, grpc.WithInsecure(), grpc.WithBlock()) var req, reply proto.Message
if err != nil { if err := grpc.Invoke(context.Background(), "/grpc.testing.TestService/UnimplementedCall", req, reply, cc); err == nil || grpc.Code(err) != codes.Unimplemented {
grpclog.Fatalf("Failed to dial to the backend %v", err)
}
var (
req, reply proto.Message
)
if err := grpc.Invoke(context.Background(), "/foo/bar", req, reply, cc); err == nil || grpc.Code(err) != codes.Unimplemented {
grpclog.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want error code %s", err, codes.Unimplemented) grpclog.Fatalf("grpc.Invoke(_, _, _, _, _) = %v, want error code %s", err, codes.Unimplemented)
} }
} }
@ -633,14 +625,15 @@ func serverNewPayload(t testpb.PayloadType, size int32) (*testpb.Payload, error)
func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) { func (s *testServer) UnaryCall(ctx context.Context, in *testpb.SimpleRequest) (*testpb.SimpleResponse, error) {
status := in.GetResponseStatus() status := in.GetResponseStatus()
md, _ := metadata.FromContext(ctx) if md, ok := metadata.FromContext(ctx); ok {
if initialMetadata, ok := md[initialMetadataKey]; ok { if initialMetadata, ok := md[initialMetadataKey]; ok {
header := metadata.Pairs(initialMetadataKey, initialMetadata[0]) header := metadata.Pairs(initialMetadataKey, initialMetadata[0])
grpc.SendHeader(ctx, header) grpc.SendHeader(ctx, header)
} }
if trailingMetadata, ok := md[trailingMetadataKey]; ok { if trailingMetadata, ok := md[trailingMetadataKey]; ok {
trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0]) trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0])
grpc.SetTrailer(ctx, trailer) grpc.SetTrailer(ctx, trailer)
}
} }
if status != nil && *status.Code != 0 { if status != nil && *status.Code != 0 {
return nil, grpc.Errorf(codes.Code(*status.Code), *status.Message) return nil, grpc.Errorf(codes.Code(*status.Code), *status.Message)
@ -691,14 +684,15 @@ func (s *testServer) StreamingInputCall(stream testpb.TestService_StreamingInput
} }
func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServer) error { func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServer) error {
md, _ := metadata.FromContext(stream.Context()) if md, ok := metadata.FromContext(stream.Context()); ok {
if initialMetadata, ok := md[initialMetadataKey]; ok { if initialMetadata, ok := md[initialMetadataKey]; ok {
header := metadata.Pairs(initialMetadataKey, initialMetadata[0]) header := metadata.Pairs(initialMetadataKey, initialMetadata[0])
stream.SendHeader(header) stream.SendHeader(header)
} }
if trailingMetadata, ok := md[trailingMetadataKey]; ok { if trailingMetadata, ok := md[trailingMetadataKey]; ok {
trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0]) trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0])
stream.SetTrailer(trailer) stream.SetTrailer(trailer)
}
} }
for { for {
in, err := stream.Recv() in, err := stream.Recv()