Skip to content

K
k3s
Commit 0d9f2dc5 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #17081 from yujuhong/docker_tests

Auto commit by PR queue bot
parents 6ef6b9e0 543391f1
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 305 deletions
pkg/kubelet/dockertools/fake_docker_client.go
View file @ 0d9f2dc5
...@@ -66,6 +66,42 @@ func (f *FakeDockerClient) ClearCalls() { ...@@ -66,6 +66,42 @@ func (f *FakeDockerClient) ClearCalls() {
f.Removed = []string{} f.Removed = []string{}
} }
func (f *FakeDockerClient) SetFakeContainers(containers []*docker.Container) {
f.Lock()
defer f.Unlock()
// Reset the lists and the map.
f.ContainerMap = map[string]*docker.Container{}
f.ContainerList = []docker.APIContainers{}
f.ExitedContainerList = []docker.APIContainers{}
for i := range containers {
c := containers[i]
if c.Config == nil {
c.Config = &docker.Config{}
}
if c.HostConfig == nil {
c.HostConfig = &docker.HostConfig{}
}
f.ContainerMap[c.ID] = c
apiContainer := docker.APIContainers{
Names: []string{c.Name},
ID: c.ID,
}
if c.State.Running {
f.ContainerList = append(f.ContainerList, apiContainer)
} else {
f.ExitedContainerList = append(f.ExitedContainerList, apiContainer)
}
}
}
func (f *FakeDockerClient) SetFakeRunningContainers(containers []*docker.Container) {
for _, c := range containers {
c.State.Running = true
}
f.SetFakeContainers(containers)
}
func (f *FakeDockerClient) AssertCalls(calls []string) (err error) { func (f *FakeDockerClient) AssertCalls(calls []string) (err error) {
f.Lock() f.Lock()
defer f.Unlock() defer f.Unlock()
......
pkg/kubelet/dockertools/manager_test.go
View file @ 0d9f2dc5
...@@ -662,21 +662,12 @@ func TestSyncPodWithPodInfraCreatesContainer(t *testing.T) { ...@@ -662,21 +662,12 @@ func TestSyncPodWithPodInfraCreatesContainer(t *testing.T) {
}, },
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{
{
// pod infra container
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"},
ID: "9876",
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"9876": {
ID: "9876",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
fakeDocker.SetFakeRunningContainers([]*docker.Container{{
ID: "9876",
// Pod infra container.
Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
}})
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
verifyCalls(t, fakeDocker, []string{ verifyCalls(t, fakeDocker, []string{
...@@ -708,21 +699,10 @@ func TestSyncPodDeletesWithNoPodInfraContainer(t *testing.T) { ...@@ -708,21 +699,10 @@ func TestSyncPodDeletesWithNoPodInfraContainer(t *testing.T) {
}, },
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{{
{ ID: "1234",
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid> Name: "/k8s_bar1_foo1_new_12345678_0",
Names: []string{"/k8s_bar1_foo1_new_12345678_0"}, }})
ID: "1234",
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"1234": {
ID: "1234",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
...@@ -762,40 +742,19 @@ func TestSyncPodDeletesDuplicate(t *testing.T) { ...@@ -762,40 +742,19 @@ func TestSyncPodDeletesDuplicate(t *testing.T) {
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{
{ {
// the k8s prefix is required for the kubelet to manage the container ID: "1234",
Names: []string{"/k8s_foo_bar_new_12345678_1111"}, Name: "/k8s_foo_bar_new_12345678_1111",
ID: "1234",
}, },
{ {
// pod infra container ID: "9876",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_bar_new_12345678_2222"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_bar_new_12345678_2222",
ID: "9876",
}, },
{ {
// Duplicate for the same container. ID: "4567",
Names: []string{"/k8s_foo_bar_new_12345678_3333"}, Name: "/k8s_foo_bar_new_12345678_3333",
ID: "4567", }})
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"1234": {
ID: "1234",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
"9876": {
ID: "9876",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
"4567": {
ID: "4567",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
...@@ -826,31 +785,15 @@ func TestSyncPodBadHash(t *testing.T) { ...@@ -826,31 +785,15 @@ func TestSyncPodBadHash(t *testing.T) {
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{
{ {
// the k8s prefix is required for the kubelet to manage the container ID: "1234",
Names: []string{"/k8s_bar.1234_foo_new_12345678_42"}, Name: "/k8s_bar.1234_foo_new_12345678_42",
ID: "1234",
}, },
{ {
// pod infra container ID: "9876",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_42"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_42",
ID: "9876", }})
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"1234": {
ID: "1234",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
"9876": {
ID: "9876",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
verifyCalls(t, fakeDocker, []string{ verifyCalls(t, fakeDocker, []string{
...@@ -882,30 +825,15 @@ func TestSyncPodsUnhealthy(t *testing.T) { ...@@ -882,30 +825,15 @@ func TestSyncPodsUnhealthy(t *testing.T) {
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{
{ {
// the k8s prefix is required for the kubelet to manage the container ID: unhealthyContainerID,
Names: []string{"/k8s_unhealthy_foo_new_12345678_42"}, Name: "/k8s_unhealthy_foo_new_12345678_42",
ID: unhealthyContainerID,
}, },
{ {
// pod infra container ID: infraContainerID,
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_42"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_42",
ID: infraContainerID, }})
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
unhealthyContainerID: {
ID: unhealthyContainerID,
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
infraContainerID: {
ID: infraContainerID,
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
dm.livenessManager.Set(kubetypes.DockerID(unhealthyContainerID).ContainerID(), proberesults.Failure, nil) dm.livenessManager.Set(kubetypes.DockerID(unhealthyContainerID).ContainerID(), proberesults.Failure, nil)
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
...@@ -939,31 +867,15 @@ func TestSyncPodsDoesNothing(t *testing.T) { ...@@ -939,31 +867,15 @@ func TestSyncPodsDoesNothing(t *testing.T) {
}, },
}, },
} }
fakeDocker.SetFakeRunningContainers([]*docker.Container{
fakeDocker.ContainerList = []docker.APIContainers{
{ {
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid>_<random> ID: "1234",
Names: []string{"/k8s_bar." + strconv.FormatUint(kubecontainer.HashContainer(&container), 16) + "_foo_new_12345678_0"}, Name: "/k8s_bar." + strconv.FormatUint(kubecontainer.HashContainer(&container), 16) + "_foo_new_12345678_0",
ID: "1234",
}, },
{ {
// pod infra container ID: "9876",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
ID: "9876", }})
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"1234": {
ID: "1234",
HostConfig: &docker.HostConfig{},
Config: &docker.Config{},
},
"9876": {
ID: "9876",
HostConfig: &docker.HostConfig{},
Config: &docker.Config{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
...@@ -1049,40 +961,19 @@ func TestSyncPodWithRestartPolicy(t *testing.T) { ...@@ -1049,40 +961,19 @@ func TestSyncPodWithRestartPolicy(t *testing.T) {
Containers: containers, Containers: containers,
}, },
} }
dockerContainers := []*docker.Container{
runningAPIContainers := []docker.APIContainers{
{
// pod infra container
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"},
ID: "9876",
},
}
exitedAPIContainers := []docker.APIContainers{
{
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid>
Names: []string{"/k8s_succeeded." + strconv.FormatUint(kubecontainer.HashContainer(&containers[0]), 16) + "_foo_new_12345678_0"},
ID: "1234",
},
{ {
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid>
Names: []string{"/k8s_failed." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_foo_new_12345678_0"},
ID: "5678",
},
}
containerMap := map[string]*docker.Container{
"9876": {
ID: "9876", ID: "9876",
Name: "POD", Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
Config: &docker.Config{}, Config: &docker.Config{},
State: docker.State{ State: docker.State{
StartedAt: time.Now(), StartedAt: time.Now(),
Running: true, Running: true,
}, },
}, },
"1234": { {
ID: "1234", ID: "1234",
Name: "succeeded", Name: "/k8s_succeeded." + strconv.FormatUint(kubecontainer.HashContainer(&containers[0]), 16) + "_foo_new_12345678_0",
Config: &docker.Config{}, Config: &docker.Config{},
State: docker.State{ State: docker.State{
ExitCode: 0, ExitCode: 0,
...@@ -1090,17 +981,16 @@ func TestSyncPodWithRestartPolicy(t *testing.T) { ...@@ -1090,17 +981,16 @@ func TestSyncPodWithRestartPolicy(t *testing.T) {
FinishedAt: time.Now(), FinishedAt: time.Now(),
}, },
}, },
"5678": { {
ID: "5678", ID: "5678",
Name: "failed", Name: "/k8s_failed." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_foo_new_12345678_0",
Config: &docker.Config{}, Config: &docker.Config{},
State: docker.State{ State: docker.State{
ExitCode: 42, ExitCode: 42,
StartedAt: time.Now(), StartedAt: time.Now(),
FinishedAt: time.Now(), FinishedAt: time.Now(),
}, },
}, }}
}
tests := []struct { tests := []struct {
policy api.RestartPolicy policy api.RestartPolicy
...@@ -1144,13 +1034,9 @@ func TestSyncPodWithRestartPolicy(t *testing.T) { ...@@ -1144,13 +1034,9 @@ func TestSyncPodWithRestartPolicy(t *testing.T) {
} }
for i, tt := range tests { for i, tt := range tests {
fakeDocker.ContainerList = runningAPIContainers fakeDocker.SetFakeContainers(dockerContainers)
fakeDocker.ExitedContainerList = exitedAPIContainers
fakeDocker.ContainerMap = containerMap
pod.Spec.RestartPolicy = tt.policy pod.Spec.RestartPolicy = tt.policy
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
// 'stop' is because the pod infra container is killed when no container is running. // 'stop' is because the pod infra container is killed when no container is running.
verifyCalls(t, fakeDocker, tt.calls) verifyCalls(t, fakeDocker, tt.calls)
...@@ -1181,47 +1067,28 @@ func TestGetPodStatusWithLastTermination(t *testing.T) { ...@@ -1181,47 +1067,28 @@ func TestGetPodStatusWithLastTermination(t *testing.T) {
}, },
} }
exitedAPIContainers := []docker.APIContainers{ dockerContainers := []*docker.Container{
{ {
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid> ID: "9876",
Names: []string{"/k8s_succeeded." + strconv.FormatUint(kubecontainer.HashContainer(&containers[0]), 16) + "_foo_new_12345678_0"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
ID: "1234",
},
{
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid>
Names: []string{"/k8s_failed." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_foo_new_12345678_0"},
ID: "5678",
},
}
containerMap := map[string]*docker.Container{
"9876": {
ID: "9876",
Name: "POD",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
State: docker.State{ State: docker.State{
StartedAt: time.Now(), StartedAt: time.Now(),
FinishedAt: time.Now(), FinishedAt: time.Now(),
Running: true, Running: true,
}, },
}, },
"1234": { {
ID: "1234", ID: "1234",
Name: "succeeded", Name: "/k8s_succeeded." + strconv.FormatUint(kubecontainer.HashContainer(&containers[0]), 16) + "_foo_new_12345678_0",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
State: docker.State{ State: docker.State{
ExitCode: 0, ExitCode: 0,
StartedAt: time.Now(), StartedAt: time.Now(),
FinishedAt: time.Now(), FinishedAt: time.Now(),
}, },
}, },
"5678": { {
ID: "5678", ID: "5678",
Name: "failed", Name: "/k8s_failed." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_foo_new_12345678_0",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
State: docker.State{ State: docker.State{
ExitCode: 42, ExitCode: 42,
StartedAt: time.Now(), StartedAt: time.Now(),
...@@ -1257,18 +1124,9 @@ func TestGetPodStatusWithLastTermination(t *testing.T) { ...@@ -1257,18 +1124,9 @@ func TestGetPodStatusWithLastTermination(t *testing.T) {
} }
for i, tt := range tests { for i, tt := range tests {
fakeDocker.ExitedContainerList = exitedAPIContainers fakeDocker.SetFakeContainers(dockerContainers)
fakeDocker.ContainerMap = containerMap
fakeDocker.ClearCalls() fakeDocker.ClearCalls()
pod.Spec.RestartPolicy = tt.policy pod.Spec.RestartPolicy = tt.policy
fakeDocker.ContainerList = []docker.APIContainers{
{
// pod infra container
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"},
ID: "9876",
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
// Check if we can retrieve the pod status. // Check if we can retrieve the pod status.
...@@ -1317,53 +1175,27 @@ func TestSyncPodBackoff(t *testing.T) { ...@@ -1317,53 +1175,27 @@ func TestSyncPodBackoff(t *testing.T) {
}, },
} }
containerList := []docker.APIContainers{
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid>_<random>
{
// pod infra container
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_podfoo_nsnew_12345678_0"},
ID: "9876",
},
{
Names: []string{"/k8s_good." + strconv.FormatUint(kubecontainer.HashContainer(&containers[0]), 16) + "_podfoo_nsnew_12345678_0"},
ID: "1234",
},
}
exitedAPIContainers := []docker.APIContainers{
{
// format is // k8s_<container-id>_<pod-fullname>_<pod-uid>
Names: []string{"/k8s_bad." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_podfoo_nsnew_12345678_0"},
ID: "5678",
},
}
stableId := "k8s_bad." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_podfoo_nsnew_12345678" stableId := "k8s_bad." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_podfoo_nsnew_12345678"
containerMap := map[string]*docker.Container{ dockerContainers := []*docker.Container{
"9876": { {
ID: "9876", ID: "9876",
Name: "POD", Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_podfoo_nsnew_12345678_0",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
State: docker.State{ State: docker.State{
StartedAt: startTime, StartedAt: startTime,
Running: true, Running: true,
}, },
}, },
"1234": { {
ID: "1234", ID: "1234",
Name: "good", Name: "/k8s_good." + strconv.FormatUint(kubecontainer.HashContainer(&containers[0]), 16) + "_podfoo_nsnew_12345678_0",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
State: docker.State{ State: docker.State{
StartedAt: startTime, StartedAt: startTime,
Running: true, Running: true,
}, },
}, },
"5678": { {
ID: "5678", ID: "5678",
Name: "bad", Name: "/k8s_bad." + strconv.FormatUint(kubecontainer.HashContainer(&containers[1]), 16) + "_podfoo_nsnew_12345678_0",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
State: docker.State{ State: docker.State{
ExitCode: 42, ExitCode: 42,
StartedAt: startTime, StartedAt: startTime,
...@@ -1395,9 +1227,7 @@ func TestSyncPodBackoff(t *testing.T) { ...@@ -1395,9 +1227,7 @@ func TestSyncPodBackoff(t *testing.T) {
backOff := util.NewBackOff(time.Second, time.Minute) backOff := util.NewBackOff(time.Second, time.Minute)
backOff.Clock = fakeClock backOff.Clock = fakeClock
for _, c := range tests { for _, c := range tests {
fakeDocker.ContainerMap = containerMap fakeDocker.SetFakeContainers(dockerContainers)
fakeDocker.ExitedContainerList = exitedAPIContainers
fakeDocker.ContainerList = containerList
fakeClock.Time = startTime.Add(time.Duration(c.tick) * time.Second) fakeClock.Time = startTime.Add(time.Duration(c.tick) * time.Second)
runSyncPod(t, dm, fakeDocker, pod, backOff, c.expectErr) runSyncPod(t, dm, fakeDocker, pod, backOff, c.expectErr)
...@@ -1410,7 +1240,7 @@ func TestSyncPodBackoff(t *testing.T) { ...@@ -1410,7 +1240,7 @@ func TestSyncPodBackoff(t *testing.T) {
if len(fakeDocker.Created) > 0 { if len(fakeDocker.Created) > 0 {
// pretend kill the container // pretend kill the container
fakeDocker.Created = nil fakeDocker.Created = nil
containerMap["5678"].State.FinishedAt = startTime.Add(time.Duration(c.killDelay) * time.Second) dockerContainers[2].State.FinishedAt = startTime.Add(time.Duration(c.killDelay) * time.Second)
} }
} }
} }
...@@ -1437,19 +1267,10 @@ func TestGetPodCreationFailureReason(t *testing.T) { ...@@ -1437,19 +1267,10 @@ func TestGetPodCreationFailureReason(t *testing.T) {
// Pretend that the pod infra container has already been created, so that // Pretend that the pod infra container has already been created, so that
// we can run the user containers. // we can run the user containers.
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{{
{ ID: "9876",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
ID: "9876", }})
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"9876": {
ID: "9876",
HostConfig: &docker.HostConfig{},
Config: &docker.Config{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, true) runSyncPod(t, dm, fakeDocker, pod, nil, true)
// Check if we can retrieve the pod status. // Check if we can retrieve the pod status.
...@@ -1490,23 +1311,12 @@ func TestGetPodPullImageFailureReason(t *testing.T) { ...@@ -1490,23 +1311,12 @@ func TestGetPodPullImageFailureReason(t *testing.T) {
Containers: []api.Container{{Name: "bar", Image: "realImage", ImagePullPolicy: api.PullAlways}}, Containers: []api.Container{{Name: "bar", Image: "realImage", ImagePullPolicy: api.PullAlways}},
}, },
} }
// Pretend that the pod infra container has already been created, so that // Pretend that the pod infra container has already been created, so that
// we can run the user containers. // we can run the user containers.
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{{
{ ID: "9876",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"}, Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
ID: "9876", }})
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"9876": {
ID: "9876",
HostConfig: &docker.HostConfig{},
Config: &docker.Config{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, true) runSyncPod(t, dm, fakeDocker, pod, nil, true)
// Check if we can retrieve the pod status. // Check if we can retrieve the pod status.
status, err := dm.GetPodStatus(pod) status, err := dm.GetPodStatus(pod)
...@@ -1623,7 +1433,6 @@ func TestGetTerminationMessagePath(t *testing.T) { ...@@ -1623,7 +1433,6 @@ func TestGetTerminationMessagePath(t *testing.T) {
} }
fakeDocker.ContainerMap = map[string]*docker.Container{} fakeDocker.ContainerMap = map[string]*docker.Container{}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
containerList := fakeDocker.ContainerList containerList := fakeDocker.ContainerList
...@@ -1668,21 +1477,10 @@ func TestSyncPodWithPodInfraCreatesContainerCallsHandler(t *testing.T) { ...@@ -1668,21 +1477,10 @@ func TestSyncPodWithPodInfraCreatesContainerCallsHandler(t *testing.T) {
}, },
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{{
{ ID: "9876",
// pod infra container Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0"}, }})
ID: "9876",
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"9876": {
ID: "9876",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, false) runSyncPod(t, dm, fakeDocker, pod, nil, false)
verifyCalls(t, fakeDocker, []string{ verifyCalls(t, fakeDocker, []string{
...@@ -1731,21 +1529,10 @@ func TestSyncPodEventHandlerFails(t *testing.T) { ...@@ -1731,21 +1529,10 @@ func TestSyncPodEventHandlerFails(t *testing.T) {
}, },
} }
fakeDocker.ContainerList = []docker.APIContainers{ fakeDocker.SetFakeRunningContainers([]*docker.Container{{
{ ID: "9876",
// pod infra container Name: "/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_0",
Names: []string{"/k8s_POD." + strconv.FormatUint(generatePodInfraContainerHash(pod), 16) + "_foo_new_12345678_42"}, }})
ID: "9876",
},
}
fakeDocker.ContainerMap = map[string]*docker.Container{
"9876": {
ID: "9876",
Config: &docker.Config{},
HostConfig: &docker.HostConfig{},
},
}
runSyncPod(t, dm, fakeDocker, pod, nil, true) runSyncPod(t, dm, fakeDocker, pod, nil, true)
verifyCalls(t, fakeDocker, []string{ verifyCalls(t, fakeDocker, []string{
...@@ -1886,8 +1673,6 @@ func TestSyncPodWithHostNetwork(t *testing.T) { ...@@ -1886,8 +1673,6 @@ func TestSyncPodWithHostNetwork(t *testing.T) {
func TestGetPodStatusSortedContainers(t *testing.T) { func TestGetPodStatusSortedContainers(t *testing.T) {
dm, fakeDocker := newTestDockerManager() dm, fakeDocker := newTestDockerManager()
dockerInspect := map[string]*docker.Container{}
dockerList := []docker.APIContainers{}
specContainerList := []api.Container{} specContainerList := []api.Container{}
expectedOrder := []string{} expectedOrder := []string{}
...@@ -1899,25 +1684,20 @@ func TestGetPodStatusSortedContainers(t *testing.T) { ...@@ -1899,25 +1684,20 @@ func TestGetPodStatusSortedContainers(t *testing.T) {
Image: "some:latest", Image: "some:latest",
} }
dockerContainers := []*docker.Container{}
for i := 0; i < numContainers; i++ { for i := 0; i < numContainers; i++ {
id := fmt.Sprintf("%v", i) id := fmt.Sprintf("%v", i)
containerName := fmt.Sprintf("%vcontainer", id) containerName := fmt.Sprintf("%vcontainer", id)
expectedOrder = append(expectedOrder, containerName) expectedOrder = append(expectedOrder, containerName)
dockerInspect[id] = &docker.Container{ dockerContainers = append(dockerContainers, &docker.Container{
ID: id, ID: id,
Name: containerName, Name: fmt.Sprintf("/k8s_%v_%v_%v_%v_42", containerName, podName, podNs, podUID),
Config: fakeConfig, Config: fakeConfig,
Image: fmt.Sprintf("%vimageid", id), Image: fmt.Sprintf("%vimageid", id),
}
dockerList = append(dockerList, docker.APIContainers{
ID: id,
Names: []string{fmt.Sprintf("/k8s_%v_%v_%v_%v_42", containerName, podName, podNs, podUID)},
}) })
specContainerList = append(specContainerList, api.Container{Name: containerName}) specContainerList = append(specContainerList, api.Container{Name: containerName})
} }
fakeDocker.SetFakeRunningContainers(dockerContainers)
fakeDocker.ContainerMap = dockerInspect
fakeDocker.ContainerList = dockerList
fakeDocker.ClearCalls() fakeDocker.ClearCalls()
pod := &api.Pod{ pod := &api.Pod{
ObjectMeta: api.ObjectMeta{ ObjectMeta: api.ObjectMeta{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment