github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

modify code to compile on updated containerd

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/server/sandbox_status_test.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/stretchr/testify/require"
"golang.org/x/net/context"
"github.com/containerd/containerd/api/types/container"
"github.com/containerd/containerd/api/types/task"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
@@ -95,7 +95,7 @@ func getSandboxStatusTestData() (*metadata.SandboxMetadata, *runtime.PodSandboxS
func TestPodSandboxStatus(t *testing.T) {
for desc, test := range map[string]struct {
sandboxContainers []container.Container
sandboxContainers []task.Task
injectMetadata bool
injectErr error
injectIP bool
@@ -112,10 +112,10 @@ func TestPodSandboxStatus(t *testing.T) {
expectedCNICalls: []string{},
},
"sandbox status with running sandbox container": {
sandboxContainers: []container.Container{{
sandboxContainers: []task.Task{{
ID: sandboxStatusTestID,
Pid: 1,
Status: container.Status_RUNNING,
Status: task.StatusRunning,
}},
injectMetadata: true,
expectState: runtime.PodSandboxState_SANDBOX_READY,
@@ -123,10 +123,10 @@ func TestPodSandboxStatus(t *testing.T) {
expectedCNICalls: []string{"GetContainerNetworkStatus"},
},
"sandbox status with stopped sandbox container": {
sandboxContainers: []container.Container{{
sandboxContainers: []task.Task{{
ID: sandboxStatusTestID,
Pid: 1,
Status: container.Status_STOPPED,
Status: task.StatusStopped,
}},
injectMetadata: true,
expectState: runtime.PodSandboxState_SANDBOX_NOTREADY,
@@ -134,17 +134,17 @@ func TestPodSandboxStatus(t *testing.T) {
expectedCNICalls: []string{"GetContainerNetworkStatus"},
},
"sandbox status with non-existing sandbox container": {
sandboxContainers: []container.Container{},
sandboxContainers: []task.Task{},
injectMetadata: true,
expectState: runtime.PodSandboxState_SANDBOX_NOTREADY,
expectCalls: []string{"info"},
expectedCNICalls: []string{"GetContainerNetworkStatus"},
},
"sandbox status with arbitrary error": {
sandboxContainers: []container.Container{{
sandboxContainers: []task.Task{{
ID: sandboxStatusTestID,
Pid: 1,
Status: container.Status_RUNNING,
Status: task.StatusRunning,
}},
injectMetadata: true,
expectState: runtime.PodSandboxState_SANDBOX_READY,
@@ -154,10 +154,10 @@ func TestPodSandboxStatus(t *testing.T) {
expectedCNICalls: []string{},
},
"sandbox status with IP address": {
sandboxContainers: []container.Container{{
sandboxContainers: []task.Task{{
ID: sandboxStatusTestID,
Pid: 1,
Status: container.Status_RUNNING,
Status: task.StatusRunning,
}},
injectMetadata: true,
expectState: runtime.PodSandboxState_SANDBOX_READY,
@@ -166,10 +166,10 @@ func TestPodSandboxStatus(t *testing.T) {
expectedCNICalls: []string{"GetContainerNetworkStatus"},
},
"sandbox status with GetContainerNetworkStatus returns error": {
sandboxContainers: []container.Container{{
sandboxContainers: []task.Task{{
ID: sandboxStatusTestID,
Pid: 1,
Status: container.Status_RUNNING,
Status: task.StatusRunning,
}},
injectMetadata: true,
expectState: runtime.PodSandboxState_SANDBOX_READY,