scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27364 from gmarek/schedulerPredicates

Browse Source 
Automatic merge from submit-queue

Fix SchedulerPredictes resources test

Fix #27115 (the part that's not a dupe).

cc @fejta
This commit is contained in:
k8s-merge-robot
2016-06-16 14:45:38 -07:00
committed by GitHub
parent 0856e1dd43 aceb273ade
commit 3c7f70543b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/scheduler_predicates.go
View File

@@ -297,7 +297,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
framework.ExpectNoError(err)
for _, pod := range pods.Items {
_, found := nodeToCapacityMap[pod.Spec.NodeName]
if found && pod.Status.Phase == api.PodRunning {
if found && pod.Status.Phase != api.PodSucceeded && pod.Status.Phase != api.PodFailed {
framework.Logf("Pod %v requesting resource cpu=%vm on Node %v", pod.Name, getRequestedCPU(pod), pod.Spec.NodeName)
nodeToCapacityMap[pod.Spec.NodeName] -= getRequestedCPU(pod)
}