From 2769b6cafd5c99be849b44c08d6f09e5d2c32f8c Mon Sep 17 00:00:00 2001 From: Noah Eisen Date: Wed, 9 Nov 2016 15:14:48 -0800 Subject: [PATCH] Fix comments from github --- interop/client/client.go | 8 +++--- interop/test_utils.go | 58 ++++++++++++++++++---------------------- 2 files changed, 30 insertions(+), 36 deletions(-) diff --git a/interop/client/client.go b/interop/client/client.go index b8a345ca..7961752b 100644 --- a/interop/client/client.go +++ b/interop/client/client.go @@ -72,9 +72,9 @@ var ( 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; status_code_and_message: status code propagated back to client; - custom_metadata: server will echo custom metadata; - unimplemented_method: client attempts to call unimplemented method; - unimplemented_service: client attempts to call unimplemented service`) + custom_metadata: server will echo custom metadata; + unimplemented_method: client attempts to call unimplemented method; + unimplemented_service: client attempts to call unimplemented service.`) // The test CA root cert file testCAFile = "testdata/ca.pem" @@ -191,7 +191,7 @@ func main() { interop.DoCustomMetadata(tc) grpclog.Println("CustomMetadata done") case "unimplemented_method": - interop.DoUnimplementedMethod(serverAddr) + interop.DoUnimplementedMethod(conn) grpclog.Println("UnimplementedMethod done") case "unimplemented_service": interop.DoUnimplementedService(testpb.NewUnimplementedServiceClient(conn)) diff --git a/interop/test_utils.go b/interop/test_utils.go index 708ade17..e0f8bd8c 100644 --- a/interop/test_utils.go +++ b/interop/test_utils.go @@ -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) { - // Testing with UnaryCall + // Testing with UnaryCall. pl := clientNewPayload(testpb.PayloadType_COMPRESSABLE, 1) req := &testpb.SimpleRequest{ ResponseType: testpb.PayloadType_COMPRESSABLE.Enum(), @@ -507,7 +507,7 @@ func DoCustomMetadata(tc testpb.TestServiceClient) { } validateMetadata(header, trailer) - // Testing with FullDuplex + // Testing with FullDuplex. stream, err := tc.FullDuplexCall(ctx) if err != nil { grpclog.Fatalf("%v.FullDuplexCall(_) = _, %v, want ", tc, err) @@ -579,24 +579,16 @@ func DoStatusCodeAndMessage(tc testpb.TestServiceClient) { // DoUnimplementedService attempts to call a method from an unimplemented service. func DoUnimplementedService(tc testpb.UnimplementedServiceClient) { - var code int32 = 12 - expectedCode := codes.Code(code) _, err := tc.UnimplementedCall(context.Background(), &testpb.Empty{}) - if grpc.Code(err) != expectedCode { - grpclog.Fatalf("%v.UnimplementedCall() = _, %v, want _, %v", tc, grpc.Code(err), expectedCode) + if grpc.Code(err) != codes.Unimplemented { + grpclog.Fatalf("%v.UnimplementedCall() = _, %v, want _, %v", tc, grpc.Code(err), codes.Unimplemented) } } // DoUnimplementedMethod attempts to call an unimplemented method. -func DoUnimplementedMethod(serverAddr string) { - cc, err := grpc.Dial(serverAddr, grpc.WithInsecure(), grpc.WithBlock()) - if err != nil { - 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 { +func DoUnimplementedMethod(cc *grpc.ClientConn) { + var req, reply proto.Message + if err := grpc.Invoke(context.Background(), "/grpc.testing.TestService/UnimplementedCall", req, reply, cc); err == nil || grpc.Code(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) { status := in.GetResponseStatus() - md, _ := metadata.FromContext(ctx) - if initialMetadata, ok := md[initialMetadataKey]; ok { - header := metadata.Pairs(initialMetadataKey, initialMetadata[0]) - grpc.SendHeader(ctx, header) - } - if trailingMetadata, ok := md[trailingMetadataKey]; ok { - trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0]) - grpc.SetTrailer(ctx, trailer) + if md, ok := metadata.FromContext(ctx); ok { + if initialMetadata, ok := md[initialMetadataKey]; ok { + header := metadata.Pairs(initialMetadataKey, initialMetadata[0]) + grpc.SendHeader(ctx, header) + } + if trailingMetadata, ok := md[trailingMetadataKey]; ok { + trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0]) + grpc.SetTrailer(ctx, trailer) + } } if status != nil && *status.Code != 0 { 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 { - md, _ := metadata.FromContext(stream.Context()) - if initialMetadata, ok := md[initialMetadataKey]; ok { - header := metadata.Pairs(initialMetadataKey, initialMetadata[0]) - stream.SendHeader(header) - } - if trailingMetadata, ok := md[trailingMetadataKey]; ok { - trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0]) - stream.SetTrailer(trailer) + if md, ok := metadata.FromContext(stream.Context()); ok { + if initialMetadata, ok := md[initialMetadataKey]; ok { + header := metadata.Pairs(initialMetadataKey, initialMetadata[0]) + stream.SendHeader(header) + } + if trailingMetadata, ok := md[trailingMetadataKey]; ok { + trailer := metadata.Pairs(trailingMetadataKey, trailingMetadata[0]) + stream.SetTrailer(trailer) + } } for { in, err := stream.Recv()