From a600ac0cca04346115bbc281ed958534265f8c83 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Fri, 30 Oct 2015 08:56:11 -0700 Subject: [PATCH] Revert "An attempt to fix flake in TestControllerSyncJob (14500)" --- pkg/controller/job/controller_test.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkg/controller/job/controller_test.go b/pkg/controller/job/controller_test.go index ab7d05f2a6a..4714f6eb5b6 100644 --- a/pkg/controller/job/controller_test.go +++ b/pkg/controller/job/controller_test.go @@ -166,14 +166,7 @@ func TestControllerSyncJob(t *testing.T) { manager := NewJobController(client, controller.NoResyncPeriodFunc) fakePodControl := controller.FakePodControl{Err: tc.podControllerError} manager.podControl = &fakePodControl - var job *extensions.Job - manager.podStoreSynced = func() bool { - selector, _ := extensions.PodSelectorAsSelector(job.Spec.Selector) - podList, _ := manager.podStore.Pods(job.Namespace).List(selector) - active := len(controller.FilterActivePods(podList.Items)) - succeeded, failed := getStatus(podList.Items) - return active == tc.activePods && succeeded == tc.succeededPods && failed == tc.failedPods - } + manager.podStoreSynced = alwaysReady var actual *extensions.Job manager.updateHandler = func(job *extensions.Job) error { actual = job @@ -181,7 +174,7 @@ func TestControllerSyncJob(t *testing.T) { } // job & pods setup - job = newJob(tc.parallelism, tc.completions) + job := newJob(tc.parallelism, tc.completions) manager.jobStore.Store.Add(job) for _, pod := range newPodList(tc.activePods, api.PodRunning, job) { manager.podStore.Store.Add(&pod)