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

Fix check for error string.

Browse Source
This commit is contained in:
Mark D. Roth
2016-07-01 09:04:20 -07:00
parent 0eec1573d0
commit 7a971bb142
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interop/test_utils.go
View File

@ -458,11 +458,11 @@ 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"
// Test UnaryCall.
respStatus := &testpb.EchoStatus{ respStatus := &testpb.EchoStatus{
Code: &code, Code: &code,
Message: &msg, Message: &msg,
} }
// Test UnaryCall.
req := &testpb.SimpleRequest{ req := &testpb.SimpleRequest{
ResponseStatus: respStatus, ResponseStatus: respStatus,
} }
@ -470,7 +470,7 @@ func DoStatusCodeAndMessage(tc testpb.TestServiceClient) {
if grpc.Code(err) != codes.Code(code) { if grpc.Code(err) != codes.Code(code) {
grpclog.Fatalf("/TestService/UnaryCall RPC compleled with error code %d, want %d", grpc.Code(err), code) grpclog.Fatalf("/TestService/UnaryCall RPC compleled with error code %d, want %d", grpc.Code(err), code)
} }
if err.Error() != msg { if err.Error() != fmt.Sprint("rpc error: code = ", code, " desc = ", msg) {
grpclog.Fatal("/TestService/UnaryCall unexpected RPC error message: ", err) grpclog.Fatal("/TestService/UnaryCall unexpected RPC error message: ", err)
} }
// Test FullDuplexCall. // Test FullDuplexCall.
@ -488,7 +488,7 @@ func DoStatusCodeAndMessage(tc testpb.TestServiceClient) {
if grpc.Code(err) != codes.Code(code) { if grpc.Code(err) != codes.Code(code) {
grpclog.Fatalf("%v compleled with error code %d, want %d", stream, grpc.Code(err), code) grpclog.Fatalf("%v compleled with error code %d, want %d", stream, grpc.Code(err), code)
} }
if err.Error() != msg { if err.Error() != fmt.Sprint("rpc error: code = ", code, " desc = ", msg) {
grpclog.Fatalf("%v unexpected RPC error message: %v", stream, err) grpclog.Fatalf("%v unexpected RPC error message: %v", stream, err)
} }
} }