Revert "Scheduler predicates tests should consider unschedulable"

This commit is contained in:
Marek Grabowski 2016-07-19 18:50:40 -07:00 committed by GitHub
parent a279673de6
commit ec4b28791e

View File

@ -172,7 +172,7 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() {
c = f.Client c = f.Client
ns = f.Namespace.Name ns = f.Namespace.Name
nodeList = &api.NodeList{} nodeList = &api.NodeList{}
nodes := framework.GetReadySchedulableNodesOrDie(c) nodes, err := c.Nodes().List(api.ListOptions{})
masterNodes = sets.NewString() masterNodes = sets.NewString()
for _, node := range nodes.Items { for _, node := range nodes.Items {
if system.IsMasterNode(&node) { 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) framework.ExpectNoError(err)
// Every test case in this suite assumes that cluster add-on pods stay stable and // Every test case in this suite assumes that cluster add-on pods stay stable and