From fd76f71fd5d333eda9ccf8c484c0a085cb52159c Mon Sep 17 00:00:00 2001 From: Maciej Szulik Date: Thu, 14 Jul 2016 11:44:19 +0200 Subject: [PATCH] Fix issue with closing channels in job controller tests --- pkg/controller/job/jobcontroller_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/controller/job/jobcontroller_test.go b/pkg/controller/job/jobcontroller_test.go index bef44dd84b0..f76cdb2d6bf 100644 --- a/pkg/controller/job/jobcontroller_test.go +++ b/pkg/controller/job/jobcontroller_test.go @@ -20,6 +20,7 @@ import ( "fmt" "reflect" "testing" + "time" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" @@ -32,6 +33,7 @@ import ( "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/rand" + "k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/watch" ) @@ -718,7 +720,8 @@ func TestWatchPods(t *testing.T) { // and make sure it hits the sync method for the right job. stopCh := make(chan struct{}) defer close(stopCh) - go manager.Run(1, stopCh) + go manager.internalPodInformer.Run(stopCh) + go wait.Until(manager.worker, 10*time.Millisecond, stopCh) pods := newPodList(1, api.PodRunning, testJob) testPod := pods[0]