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

Code review changes.

Browse Source
This commit is contained in:
Mark D. Roth
2016-07-07 07:39:32 -07:00
parent f9584a00cf
commit de2db99c84
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
interop/test_utils.go
View File

@ -458,20 +458,17 @@ func DoCancelAfterFirstResponse(tc testpb.TestServiceClient) {
func DoStatusCodeAndMessage(tc testpb.TestServiceClient) { func DoStatusCodeAndMessage(tc testpb.TestServiceClient) {
var code int32 = 2 var code int32 = 2
msg := "test status message" msg := "test status message"
expectedErr := grpc.Errorf(codes.Code(code), msg)
respStatus := &testpb.EchoStatus{ respStatus := &testpb.EchoStatus{
Code: &code, Code: proto.Int32(code),
Message: &msg, Message: proto.String(msg),
} }
// Test UnaryCall. // Test UnaryCall.
req := &testpb.SimpleRequest{ req := &testpb.SimpleRequest{
ResponseStatus: respStatus, ResponseStatus: respStatus,
} }
_, err := tc.UnaryCall(context.Background(), req) if _, err := tc.UnaryCall(context.Background(), req); err.Error() != expectedErr.Error() {
if grpc.Code(err) != codes.Code(code) { grpclog.Fatalf("UnaryCall RPC returned error %v, want %v", err, expectedErr)
grpclog.Fatalf("/TestService/UnaryCall RPC compleled with error code %d, want %d", grpc.Code(err), code)
}
if err.Error() != fmt.Sprint("rpc error: code = ", code, " desc = ", msg) {
grpclog.Fatal("/TestService/UnaryCall unexpected RPC error message: ", err)
} }
// Test FullDuplexCall. // Test FullDuplexCall.
stream, err := tc.FullDuplexCall(context.Background()) stream, err := tc.FullDuplexCall(context.Background())
@ -484,16 +481,11 @@ func DoStatusCodeAndMessage(tc testpb.TestServiceClient) {
if err := stream.Send(stream_req); err != nil { if err := stream.Send(stream_req); err != nil {
grpclog.Fatalf("stream %v.Send(%v) = %v", stream, stream_req, err) grpclog.Fatalf("stream %v.Send(%v) = %v", stream, stream_req, err)
} }
err = stream.CloseSend() if err := stream.CloseSend(); err != nil {
if err != nil {
grpclog.Fatalf("stream %v.CloseSend() = %v", stream, err) grpclog.Fatalf("stream %v.CloseSend() = %v", stream, err)
} }
_, err = stream.Recv() if _, err = stream.Recv(); err.Error() != expectedErr.Error() {
if grpc.Code(err) != codes.Code(code) { grpclog.Fatalf("stream %v.Recv() returned error %v, want %v", err, expectedErr)
grpclog.Fatalf("stream %v compleled with error code %d, want %d", stream, grpc.Code(err), code)
}
if err.Error() != fmt.Sprint("rpc error: code = ", code, " desc = ", msg) {
grpclog.Fatalf("stream %v unexpected RPC error message: %v", stream, err)
} }
} }