Commit f6224590 authored by David Ashpole's avatar David Ashpole

Test Container Garbage Collection

parent c5c461df
...@@ -57,6 +57,7 @@ go_test( ...@@ -57,6 +57,7 @@ go_test(
"disk_eviction_test.go", "disk_eviction_test.go",
"dynamic_kubelet_configuration_test.go", "dynamic_kubelet_configuration_test.go",
"e2e_node_suite_test.go", "e2e_node_suite_test.go",
"garbage_collector_test.go",
"image_id_test.go", "image_id_test.go",
"kubelet_test.go", "kubelet_test.go",
"lifecycle_hook_test.go", "lifecycle_hook_test.go",
......
...@@ -41,12 +41,8 @@ var _ = framework.KubeDescribe("MemoryEviction [Slow] [Serial] [Disruptive]", fu ...@@ -41,12 +41,8 @@ var _ = framework.KubeDescribe("MemoryEviction [Slow] [Serial] [Disruptive]", fu
// memory pressure reduction, even if we time out while waiting. // memory pressure reduction, even if we time out while waiting.
Context("", func() { Context("", func() {
AfterEach(func() { AfterEach(func() {
glog.Infof("Summary of node events during the memory eviction test:") logNodeEvents(f)
err := framework.ListNamespaceEvents(f.ClientSet, f.Namespace.Name) logPodEvents(f)
framework.ExpectNoError(err)
glog.Infof("Summary of pod events during the memory eviction test:")
err = framework.ListNamespaceEvents(f.ClientSet, "")
framework.ExpectNoError(err)
}) })
Context("when there is memory pressure", func() { Context("when there is memory pressure", func() {
......
...@@ -232,3 +232,15 @@ func updateConfigMap(f *framework.Framework, kubeCfg *componentconfig.KubeletCon ...@@ -232,3 +232,15 @@ func updateConfigMap(f *framework.Framework, kubeCfg *componentconfig.KubeletCon
} }
return cmap, nil return cmap, nil
} }
func logPodEvents(f *framework.Framework) {
framework.Logf("Summary of pod events during the test:")
err := framework.ListNamespaceEvents(f.ClientSet, f.Namespace.Name)
framework.ExpectNoError(err)
}
func logNodeEvents(f *framework.Framework) {
framework.Logf("Summary of node events during the test:")
err := framework.ListNamespaceEvents(f.ClientSet, "")
framework.ExpectNoError(err)
}
...@@ -932,3 +932,4 @@ k8s.io/kubernetes/test/integration/storageclasses,andyzheng0831,1 ...@@ -932,3 +932,4 @@ k8s.io/kubernetes/test/integration/storageclasses,andyzheng0831,1
k8s.io/kubernetes/test/integration/thirdparty,davidopp,1 k8s.io/kubernetes/test/integration/thirdparty,davidopp,1
k8s.io/kubernetes/test/list,maisem,1 k8s.io/kubernetes/test/list,maisem,1
kubelet Clean up pods on node kubelet should be able to delete * pods per node in *.,yujuhong,0 kubelet Clean up pods on node kubelet should be able to delete * pods per node in *.,yujuhong,0
Garbage Collection Test: * Should eventually garbage collect containers when we exceed the number of dead containers per container,Random-Liu,0
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