From 07fb3c275963780fc80635c50bf73120e0f83440 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Sat, 24 Oct 2015 00:54:45 -0700 Subject: [PATCH] Fix jobs unittest flakes. Sometimes the test would generate two identical pod names using the Now().UnixNano() function. Apparently the Nanos are rounded. Passed 2000 unittest runs. --- pkg/controller/job/controller_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/controller/job/controller_test.go b/pkg/controller/job/controller_test.go index 536447dac15..ab7d05f2a6a 100644 --- a/pkg/controller/job/controller_test.go +++ b/pkg/controller/job/controller_test.go @@ -23,12 +23,12 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/apis/extensions" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/client/unversioned/testclient" "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util" + "k8s.io/kubernetes/pkg/util/rand" "k8s.io/kubernetes/pkg/watch" ) @@ -77,7 +77,7 @@ func newPodList(count int, status api.PodPhase, job *extensions.Job) []api.Pod { for i := 0; i < count; i++ { newPod := api.Pod{ ObjectMeta: api.ObjectMeta{ - Name: fmt.Sprintf("pod-%v", unversioned.Now().UnixNano()), + Name: fmt.Sprintf("pod-%v", rand.String(10)), Labels: job.Spec.Selector.MatchLabels, Namespace: job.Namespace, },