github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 13:07:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29003 from gmarek/taint

Browse Source 
Fix the fix for taint scheduler predicate test
This commit is contained in:
Marek Grabowski 2016-07-15 16:15:02 +02:00 committed by GitHub
commit d1ff1b9726
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/scheduler_predicates.go
View File

@ -1544,19 +1544,20 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
verifyResult(c, podNameNoTolerations, ns) verifyResult(c, podNameNoTolerations, ns)
cleanupPods(c, ns) cleanupPods(c, ns)
By("Trying to relaunch the same.") // TODO(@kevin-wangzefeng) Figure out how to do it correctly
_, err = c.Pods(ns).Create(&podNoTolerations) // By("Trying to relaunch the same.")
framework.ExpectNoError(err) // _, err = c.Pods(ns).Create(&podNoTolerations)
defer c.Pods(ns).Delete(podNameNoTolerations, api.NewDeleteOptions(0)) // framework.ExpectNoError(err)
// defer c.Pods(ns).Delete(podNameNoTolerations, api.NewDeleteOptions(0))
// check that pod got scheduled. We intentionally DO NOT check that the // // check that pod got scheduled. We intentionally DO NOT check that the
// pod is running because this will create a race condition with the // // pod is running because this will create a race condition with the
// kubelet and the scheduler: the scheduler might have scheduled a pod // // kubelet and the scheduler: the scheduler might have scheduled a pod
// already when the kubelet does not know about its new taint yet. The // // already when the kubelet does not know about its new taint yet. The
// kubelet will then refuse to launch the pod. // // kubelet will then refuse to launch the pod.
framework.ExpectNoError(framework.WaitForPodNotPending(c, ns, podNameNoTolerations)) // framework.ExpectNoError(framework.WaitForPodNotPending(c, ns, podNameNoTolerations))
deployedPod, err := c.Pods(ns).Get(podNameNoTolerations) // deployedPod, err := c.Pods(ns).Get(podNameNoTolerations)
framework.ExpectNoError(err) // framework.ExpectNoError(err)
Expect(deployedPod.Spec.NodeName).To(Equal(nodeName)) // Expect(deployedPod.Spec.NodeName).To(Equal(nodeName))
}) })
}) })