Use res.Err for RemoteErrorResultStatus and TimeoutResultStatus (#384)
When mocking tests, res.Err doesn't get read. This change sets the error
message to be res.Err if it exists so that the error message can be
forwarded to stderr for RemoteErrorResultStatus and TimeoutResultStatus.
diff --git a/go/pkg/fakes/server.go b/go/pkg/fakes/server.go
index 4d84411..96d4d82 100644
--- a/go/pkg/fakes/server.go
+++ b/go/pkg/fakes/server.go
@@ -216,11 +216,19 @@
e.Server.Exec.ActionResult = ar
switch res.Status {
case command.TimeoutResultStatus:
- e.Server.Exec.Status = status.New(codes.DeadlineExceeded, "timeout")
+ if res.Err == nil {
+ e.Server.Exec.Status = status.New(codes.DeadlineExceeded, "timeout")
+ } else {
+ e.Server.Exec.Status = status.New(codes.DeadlineExceeded, res.Err.Error())
+ }
case command.RemoteErrorResultStatus:
st, ok := status.FromError(res.Err)
if !ok {
- st = status.New(codes.Internal, "remote error")
+ if res.Err == nil {
+ st = status.New(codes.Internal, "remote error")
+ } else {
+ st = status.New(codes.Internal, res.Err.Error())
+ }
}
e.Server.Exec.Status = st
case command.CacheHitResultStatus:
