vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Update grpc and protobufs dep (#243)

Browse source 
* Update grpc and protobufs dep

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

* Fix grpc error check

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-05-18 09:16:55 -07:00
parent c3da771256
commit 614df93b92
32 changed files with 2051 additions and 1053 deletions
Download patch file Download diff file Expand all files Collapse all files

5
integration-test/start_test.go
View file

@ -9,6 +9,7 @@ import (
"github.com/docker/containerd/api/grpc/types"
"github.com/docker/docker/pkg/integration/checker"
"github.com/go-check/check"
"google.golang.org/grpc"
)
func (cs *ContainerdSuite) TestStartBusyboxLsSlash(t *check.C) {
@ -44,14 +45,14 @@ var
}
func (cs *ContainerdSuite) TestStartBusyboxNoSuchFile(t *check.C) {
expectedOutput := `oci runtime error: exec: \"NoSuchFile\": executable file not found in $PATH`
expectedOutput := `oci runtime error: exec: "NoSuchFile": executable file not found in $PATH`
if err := CreateBusyboxBundle("busybox-no-such-file", []string{"NoSuchFile"}); err != nil {
t.Fatal(err)
}
_, err := cs.RunContainer("NoSuchFile", "busybox-no-such-file")
t.Assert(err.Error(), checker.Contains, expectedOutput)
t.Assert(grpc.ErrorDesc(err), checker.Contains, expectedOutput)
}
func (cs *ContainerdSuite) TestStartBusyboxTop(t *check.C) {