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

Fix the unittests cause by applying oom_score_adj (0) to the user containers.

Browse Source
This commit is contained in:
Dawn Chen
2015-06-15 14:38:45 -07:00
committed by Brendan Burns
parent 85bb2911a3
commit c1dd527dd1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/dockertools/manager_test.go
View File

@@ -896,7 +896,7 @@ func TestSyncPodCreateNetAndContainer(t *testing.T) {
// Create pod infra container.
"create", "start", "inspect_container",
// Create container.
"create", "start",
"create", "start", "inspect_container",
})
fakeDocker.Lock()
@@ -945,7 +945,7 @@ func TestSyncPodCreatesNetAndContainerPullsImage(t *testing.T) {
// Create pod infra container.
"create", "start", "inspect_container",
// Create container.
"create", "start",
"create", "start", "inspect_container",
})
fakeDocker.Lock()
@@ -997,7 +997,7 @@ func TestSyncPodWithPodInfraCreatesContainer(t *testing.T) {
// Inspect pod infra container (but does not create)"
"inspect_container",
// Create container.
"create", "start",
"create", "start", "inspect_container",
})
fakeDocker.Lock()
@@ -1038,7 +1038,7 @@ func TestSyncPodDeletesWithNoPodInfraContainer(t *testing.T) {
// Create pod infra container.
"create", "start", "inspect_container",
// Create container.
"create", "start",
"create", "start", "inspect_container",
})
// A map iteration is used to delete containers, so must not depend on
@@ -1163,7 +1163,7 @@ func TestSyncPodBadHash(t *testing.T) {
// Check the pod infra container.
"inspect_container",
// Kill and restart the bad hash container.
"inspect_container", "stop", "create", "start",
"inspect_container", "stop", "create", "start", "inspect_container",
})
if err := fakeDocker.AssertStopped([]string{"1234"}); err != nil {
@@ -1223,7 +1223,7 @@ func TestSyncPodsUnhealthy(t *testing.T) {
// Kill the unhealthy container.
"inspect_container", "stop",
// Restart the unhealthy container.
"create", "start",
"create", "start", "inspect_container",
})
if err := fakeDocker.AssertStopped([]string{"1234"}); err != nil {
@@ -1408,7 +1408,7 @@ func TestSyncPodWithRestartPolicy(t *testing.T) {
// Check the pod infra container.
"inspect_container",
// Restart both containers.
"create", "start", "create", "start",
"create", "start", "inspect_container", "create", "start", "inspect_container",
},
[]string{"succeeded", "failed"},
[]string{},
@@ -1419,7 +1419,7 @@ func TestSyncPodWithRestartPolicy(t *testing.T) {
// Check the pod infra container.
"inspect_container",
// Restart the failed container.
"create", "start",
"create", "start", "inspect_container",
},
[]string{"failed"},
[]string{},
@@ -1832,7 +1832,7 @@ func TestSyncPodWithPodInfraCreatesContainerCallsHandler(t *testing.T) {
// Check the pod infra container.
"inspect_container",
// Create container.
"create", "start",
"create", "start", "inspect_container",
})
fakeDocker.Lock()

2
pkg/kubelet/kubelet_test.go
View File

@@ -485,7 +485,7 @@ func TestSyncPodsWithTerminationLog(t *testing.T) {
// Create pod infra container.
"create", "start", "inspect_container",
// Create container.
"create", "start",
"create", "start", "inspect_container",
// Get pod status.
"list", "inspect_container", "inspect_container",
// Get pods for deleting orphaned volumes.