modify code to compile on updated containerd

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
This commit is contained in:
Mike Brown
2017-06-07 14:41:30 -05:00
committed by Lantao Liu
parent 67e884e6cf
commit 484a326717
27 changed files with 444 additions and 453 deletions

View File

@@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
"golang.org/x/net/context"
"github.com/containerd/containerd/api/types/container"
"github.com/containerd/containerd/api/types/task"
"github.com/kubernetes-incubator/cri-containerd/pkg/metadata"
ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing"
@@ -40,7 +40,7 @@ func TestRemovePodSandbox(t *testing.T) {
Name: testName,
}
for desc, test := range map[string]struct {
sandboxContainers []container.Container
sandboxContainers []task.Task
injectMetadata bool
injectContainerdErr error
injectFSErr error
@@ -55,7 +55,7 @@ func TestRemovePodSandbox(t *testing.T) {
},
"should return error when sandbox container is not deleted": {
injectMetadata: true,
sandboxContainers: []container.Container{{ID: testID}},
sandboxContainers: []task.Task{{ID: testID}},
expectErr: true,
expectCalls: []string{"info"},
},