From 0c3fb42e9f9977bf0a655bbfc326d4e80903792e Mon Sep 17 00:00:00 2001 From: Pawel Skrzynski Date: Mon, 8 Aug 2016 14:45:57 +0200 Subject: [PATCH] Use GetMasterAndWorkerNodesOrDie in schdeuler predicates tests --- test/e2e/scheduler_predicates.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/test/e2e/scheduler_predicates.go b/test/e2e/scheduler_predicates.go index 08bdc372aa..bbf07c1b73 100644 --- a/test/e2e/scheduler_predicates.go +++ b/test/e2e/scheduler_predicates.go @@ -26,7 +26,6 @@ import ( "k8s.io/kubernetes/pkg/api/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/util/sets" - "k8s.io/kubernetes/pkg/util/system" "k8s.io/kubernetes/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" @@ -198,17 +197,10 @@ var _ = framework.KubeDescribe("SchedulerPredicates [Serial]", func() { c = f.Client ns = f.Namespace.Name nodeList = &api.NodeList{} - nodes, err := c.Nodes().List(api.ListOptions{}) - masterNodes = sets.NewString() - for _, node := range nodes.Items { - if system.IsMasterNode(&node) { - masterNodes.Insert(node.Name) - } else { - nodeList.Items = append(nodeList.Items, node) - } - } - err = framework.CheckTestingNSDeletedExcept(c, ns) + masterNodes, nodeList = framework.GetMasterAndWorkerNodesOrDie(c) + + err := framework.CheckTestingNSDeletedExcept(c, ns) framework.ExpectNoError(err) // Every test case in this suite assumes that cluster add-on pods stay stable and