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

Merge pull request #29245 from kubernetes/revert-28970-sheduler_tests_should_consider_unschedulable

Browse Source 
Automatic merge from submit-queue

Revert "Scheduler predicates tests should consider unschedulable"

Reverts kubernetes/kubernetes#28970
See https://github.com/kubernetes/kubernetes/pull/28970#issuecomment-233817280

cc @pskrzyns @rmmh
This commit is contained in:
k8s-merge-robot 2016-07-19 22:32:44 -07:00 committed by GitHub
commit 0bd6e2d810
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/scheduler_predicates.go
View File

@ -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