Skip to content

feat: return error message in the grpc server #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2023
Merged

feat: return error message in the grpc server #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/server/remote_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *HelloReply, er
}

buf := new(bytes.Buffer)
reply = &HelloReply{}

for _, testCase := range suite.Items {
simpleRunner := runner.NewSimpleTestCaseRunner()
Expand All @@ -116,14 +117,14 @@ func (s *server) Run(ctx context.Context, task *TestTask) (reply *HelloReply, er
testCase.Request.API = fmt.Sprintf("%s%s", suite.API, testCase.Request.API)
}

var output interface{}
if output, err = simpleRunner.RunTestCase(&testCase, dataContext, ctx); err == nil {
if output, testErr := simpleRunner.RunTestCase(&testCase, dataContext, ctx); testErr == nil {
dataContext[testCase.Name] = output
} else {
reply.Error = testErr.Error()
break
}
}
reply = &HelloReply{Message: buf.String()}
reply.Message = buf.String()
return
}

Expand Down
49 changes: 29 additions & 20 deletions pkg/server/server.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/server/server.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ message TestTask {

message HelloReply {
string message = 1;
string error = 2;
}

message Empty {
Expand Down
2 changes: 2 additions & 0 deletions pkg/server/server_grpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ func TestUnimplement(t *testing.T) {

var reply *server.HelloReply
assert.Empty(t, reply.GetMessage())
assert.Empty(t, reply.GetError())
assert.Empty(t, &server.Empty{})

var task *server.TestTask
Expand Down Expand Up @@ -47,6 +48,7 @@ func TestServer(t *testing.T) {
reply, err := client.GetVersion(context.Background(), &server.Empty{})
assert.NotNil(t, reply)
assert.Equal(t, "version", reply.GetMessage())
assert.Empty(t, reply.GetError())
assert.Nil(t, err)

reply, err = client.Run(context.Background(), &server.TestTask{})
Expand Down