Merge pull request #49262 from caesarxuchao/reenable-test

Automatic merge from submit-queue (batch tested with PRs 49330, 49252, 49262, 49278, 49334)

Enable garbage collector e2e tests

These tests are not running in pre-submit: see 753266cb7d/jobs/config.json (L9207)
This commit is contained in:
Kubernetes Submit Queue 2017-07-20 21:59:31 -07:00 committed by GitHub
commit 3ff99d36ee

View File

@ -486,7 +486,7 @@ var _ = SIGDescribe("Garbage collector", func() {
gatherMetrics(f)
})
It("[Feature:GarbageCollector] should keep the rc around until all its pods are deleted if the deleteOptions says so", func() {
It("should keep the rc around until all its pods are deleted if the deleteOptions says so", func() {
clientSet := f.ClientSet
rcClient := clientSet.Core().ReplicationControllers(f.Namespace.Name)
podClient := clientSet.Core().Pods(f.Namespace.Name)
@ -564,7 +564,7 @@ var _ = SIGDescribe("Garbage collector", func() {
})
// TODO: this should be an integration test
It("[Feature:GarbageCollector] should not delete dependents that have both valid owner and owner that's waiting for dependents to be deleted", func() {
It("should not delete dependents that have both valid owner and owner that's waiting for dependents to be deleted", func() {
clientSet := f.ClientSet
rcClient := clientSet.Core().ReplicationControllers(f.Namespace.Name)
podClient := clientSet.Core().Pods(f.Namespace.Name)
@ -672,7 +672,7 @@ var _ = SIGDescribe("Garbage collector", func() {
})
// TODO: should be an integration test
It("[Feature:GarbageCollector] should not be blocked by dependency circle", func() {
It("should not be blocked by dependency circle", func() {
clientSet := f.ClientSet
podClient := clientSet.Core().Pods(f.Namespace.Name)
pod1 := newGCPod("pod1")