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

Change some compression related error code

Browse Source
This commit is contained in:
iamqizhao
2016-05-10 13:54:10 -07:00
parent ab0be5212f
commit 113bf2f219
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpc_util.go
View File

@ -285,13 +285,13 @@ func checkRecvPayload(pf payloadFormat, recvCompress string, dc Decompressor) er
case compressionNone: case compressionNone:
case compressionMade: case compressionMade:
if recvCompress == "" { if recvCompress == "" {
return transport.StreamErrorf(codes.InvalidArgument, "grpc: invalid grpc-encoding %q with compression enabled", recvCompress) return transport.StreamErrorf(codes.Internal, "grpc: invalid grpc-encoding with compression enabled")
} }
if dc == nil || recvCompress != dc.Type() { if dc == nil || recvCompress != dc.Type() {
return transport.StreamErrorf(codes.InvalidArgument, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress) return transport.StreamErrorf(codes.Unimplemented, "grpc: Decompressor is not installed for grpc-encoding %q", recvCompress)
} }
default: default:
return transport.StreamErrorf(codes.InvalidArgument, "grpc: received unexpected payload format %d", pf) return transport.StreamErrorf(codes.Internal, "grpc: received unexpected payload format %d", pf)
} }
return nil return nil
} }

8
test/end2end_test.go
View File

@ -1621,8 +1621,8 @@ func testCompressServerHasNoSupport(t *testing.T, e env) {
ResponseSize: proto.Int32(respSize), ResponseSize: proto.Int32(respSize),
Payload: payload, Payload: payload,
} }
if _, err := tc.UnaryCall(context.Background(), req); err == nil || grpc.Code(err) != codes.InvalidArgument { if _, err := tc.UnaryCall(context.Background(), req); err == nil || grpc.Code(err) != codes.Unimplemented {
t.Fatalf("TestService/UnaryCall(_, _) = _, %v, want _, error code %d", err, codes.InvalidArgument) t.Fatalf("TestService/UnaryCall(_, _) = _, %v, want _, error code %d", err, codes.Unimplemented)
} }
// Streaming RPC // Streaming RPC
stream, err := tc.FullDuplexCall(context.Background()) stream, err := tc.FullDuplexCall(context.Background())
@ -1646,8 +1646,8 @@ func testCompressServerHasNoSupport(t *testing.T, e env) {
if err := stream.Send(sreq); err != nil { if err := stream.Send(sreq); err != nil {
t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, sreq, err) t.Fatalf("%v.Send(%v) = %v, want <nil>", stream, sreq, err)
} }
if _, err := stream.Recv(); err == nil || grpc.Code(err) != codes.InvalidArgument { if _, err := stream.Recv(); err == nil || grpc.Code(err) != codes.Unimplemented {
t.Fatalf("%v.Recv() = %v, want error code %d", stream, err, codes.InvalidArgument) t.Fatalf("%v.Recv() = %v, want error code %d", stream, err, codes.Unimplemented)
} }
} }