diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/hooks/exec/exec_test.go | 2 | ||||
| -rw-r--r-- | pkg/varlinkapi/containers.go | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkg/hooks/exec/exec_test.go b/pkg/hooks/exec/exec_test.go index 433f953df..62e45ff3a 100644 --- a/pkg/hooks/exec/exec_test.go +++ b/pkg/hooks/exec/exec_test.go @@ -207,7 +207,7 @@ func TestRunKillTimeout(t *testing.T) { } hookErr, err := Run(ctx, hook, []byte("{}"), nil, nil, time.Duration(0)) assert.Equal(t, context.DeadlineExceeded, err) - assert.Regexp(t, "^failed to reap process within 0s of the kill signal$", hookErr) + assert.Regexp(t, "^(failed to reap process within 0s of the kill signal|signal: killed)$", hookErr) } func init() { diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 2d3a731e9..41263b52b 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -81,7 +81,11 @@ func (i *LibpodAPI) InspectContainer(call ioprojectatomicpodman.VarlinkCall, nam if err != nil { return call.ReplyErrorOccurred(err.Error()) } - b, err := json.Marshal(inspectInfo) + data, err := batchcontainer.GetCtrInspectInfo(ctr, inspectInfo) + if err != nil { + return call.ReplyErrorOccurred(err.Error()) + } + b, err := json.Marshal(data) if err != nil { return call.ReplyErrorOccurred(fmt.Sprintf("unable to serialize")) } |