From ec4b28791e5b952234f3b2c37e9fb1011b9b9d69 Mon Sep 17 00:00:00 2001 From: Marek Grabowski Date: Tue, 19 Jul 2016 18:50:40 -0700 Subject: [PATCH] Revert "Scheduler predicates tests should consider unschedulable" --- test/e2e/scheduler_predicates.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index 4f12eafb324..8220a5b1f0f 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -172,7 +172,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { c = f.Client ns = f.Namespace.Name nodeList = &api.NodeList{} - nodes := framework.GetReadySchedulableNodesOrDie(c) + nodes, err := c.Nodes().List(api.ListOptions{}) masterNodes = sets.NewString() for _, node := range nodes.Items { if system.IsMasterNode(&node) { @@ -182,7 +182,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { } } - err := framework.CheckTestingNSDeletedExcept(c, ns) + err = framework.CheckTestingNSDeletedExcept(c, ns) framework.ExpectNoError(err) // Every test case in this suite assumes that cluster add-on pods stay stable and