github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16591 from kubernetes/revert-15838-issue14500

Browse Source 
Revert "An attempt to fix flake in TestControllerSyncJob (14500)"
This commit is contained in:
Alex Robinson 2015-10-30 13:14:05 -07:00
commit 97275873ff
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/job/controller_test.go
View File

@ -166,14 +166,7 @@ func TestControllerSyncJob(t *testing.T) {
manager := NewJobController(client, controller.NoResyncPeriodFunc) manager := NewJobController(client, controller.NoResyncPeriodFunc)
fakePodControl := controller.FakePodControl{Err: tc.podControllerError} fakePodControl := controller.FakePodControl{Err: tc.podControllerError}
manager.podControl = &fakePodControl manager.podControl = &fakePodControl
var job *extensions.Job manager.podStoreSynced = alwaysReady
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
}
var actual *extensions.Job var actual *extensions.Job
manager.updateHandler = func(job *extensions.Job) error { manager.updateHandler = func(job *extensions.Job) error {
actual = job actual = job
@ -181,7 +174,7 @@ func TestControllerSyncJob(t *testing.T) {
} }
// job & pods setup // job & pods setup
job = newJob(tc.parallelism, tc.completions) job := newJob(tc.parallelism, tc.completions)
manager.jobStore.Store.Add(job) manager.jobStore.Store.Add(job)
for _, pod := range newPodList(tc.activePods, api.PodRunning, job) { for _, pod := range newPodList(tc.activePods, api.PodRunning, job) {
manager.podStore.Store.Add(&pod) manager.podStore.Store.Add(&pod)