From a5efb009c51482889b664b153a78c710042d6e03 Mon Sep 17 00:00:00 2001 From: HaiyangDING Date: Wed, 13 Apr 2016 11:07:34 +0800 Subject: [PATCH] change predicate error format. --- plugin/pkg/scheduler/algorithm/predicates/error.go | 6 +++--- plugin/pkg/scheduler/generic_scheduler_test.go | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugin/pkg/scheduler/algorithm/predicates/error.go b/plugin/pkg/scheduler/algorithm/predicates/error.go index d746bd11a1e..9fae8a8a166 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/error.go +++ b/plugin/pkg/scheduler/algorithm/predicates/error.go @@ -35,9 +35,9 @@ var ( ErrNodeLabelPresenceViolated = newPredicateFailureError("CheckNodeLabelPresence") ErrServiceAffinityViolated = newPredicateFailureError("CheckServiceAffinity") ErrMaxVolumeCountExceeded = newPredicateFailureError("MaxVolumeCount") - // ErrFakePredicateError is used for test only. The fake predicates returning false also returns error - // as ErrFakePredicateError. - ErrFakePredicateError = newPredicateFailureError("false") + // ErrFakePredicate is used for test only. The fake predicates returning false also returns error + // as ErrFakePredicate. + ErrFakePredicate = newPredicateFailureError("FakePredicateError") ) // InsufficientResourceError is an error type that indicates what kind of resource limit is diff --git a/plugin/pkg/scheduler/generic_scheduler_test.go b/plugin/pkg/scheduler/generic_scheduler_test.go index 4519d5f507c..8e7a15d675d 100644 --- a/plugin/pkg/scheduler/generic_scheduler_test.go +++ b/plugin/pkg/scheduler/generic_scheduler_test.go @@ -34,7 +34,7 @@ import ( ) func falsePredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) { - return false, algorithmpredicates.ErrFakePredicateError + return false, algorithmpredicates.ErrFakePredicate } func truePredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) { @@ -45,14 +45,14 @@ func matchesPredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.No if pod.Name == nodeName { return true, nil } - return false, algorithmpredicates.ErrFakePredicateError + return false, algorithmpredicates.ErrFakePredicate } func hasNoPodsPredicate(pod *api.Pod, nodeName string, nodeInfo *schedulercache.NodeInfo) (bool, error) { if len(nodeInfo.Pods()) == 0 { return true, nil } - return false, algorithmpredicates.ErrFakePredicateError + return false, algorithmpredicates.ErrFakePredicate } func numericPriority(pod *api.Pod, nodeNameToInfo map[string]*schedulercache.NodeInfo, nodeLister algorithm.NodeLister) (schedulerapi.HostPriorityList, error) { @@ -192,7 +192,7 @@ func TestGenericScheduler(t *testing.T) { nodes: []string{"machine1", "machine2"}, expectsErr: true, name: "test 1", - wErr: algorithmpredicates.ErrFakePredicateError, + wErr: algorithmpredicates.ErrFakePredicate, }, { predicates: map[string]algorithm.FitPredicate{"true": truePredicate}, @@ -313,7 +313,7 @@ func TestFindFitAllError(t *testing.T) { if !found { t.Errorf("failed to find node: %s in %v", node, predicateMap) } - if failure != "false" { + if failure != "FakePredicateError" { t.Errorf("unexpected failures: %v", failure) } } @@ -330,7 +330,7 @@ func TestFindFitSomeError(t *testing.T) { } _, predicateMap, err := findNodesThatFit(pod, nodeNameToInfo, predicates, makeNodeList(nodes), nil) - if err != nil && !reflect.DeepEqual(err, algorithmpredicates.ErrFakePredicateError) { + if err != nil && !reflect.DeepEqual(err, algorithmpredicates.ErrFakePredicate) { t.Errorf("unexpected error: %v", err) } @@ -346,7 +346,7 @@ func TestFindFitSomeError(t *testing.T) { if !found { t.Errorf("failed to find node: %s in %v", node, predicateMap) } - if failure != "false" { + if failure != "FakePredicateError" { t.Errorf("unexpected failures: %v", failure) } }