From 051be8fe80e3b23286e905bb5439eb93cba12608 Mon Sep 17 00:00:00 2001
From: Wei Huang <wei.huang1@ibm.com>
Date: Fri, 3 Jan 2020 11:57:17 -0800
Subject: [PATCH] Cleanup SetPredicatesOrderingDuringTest due to deprecation of
 predicates

---
 pkg/scheduler/algorithm/predicates/utils.go  | 10 ----------
 pkg/scheduler/core/generic_scheduler_test.go | 15 ---------------
 2 files changed, 25 deletions(-)

diff --git a/pkg/scheduler/algorithm/predicates/utils.go b/pkg/scheduler/algorithm/predicates/utils.go
index 7ff192ee388..a9276763e0d 100644
--- a/pkg/scheduler/algorithm/predicates/utils.go
+++ b/pkg/scheduler/algorithm/predicates/utils.go
@@ -77,13 +77,3 @@ func portsConflict(existingPorts schedulernodeinfo.HostPortInfo, wantPorts []*v1
 
 	return false
 }
-
-// SetPredicatesOrderingDuringTest sets the predicatesOrdering to the specified
-// value, and returns a function that restores the original value.
-func SetPredicatesOrderingDuringTest(value []string) func() {
-	origVal := predicatesOrdering
-	predicatesOrdering = value
-	return func() {
-		predicatesOrdering = origVal
-	}
-}
diff --git a/pkg/scheduler/core/generic_scheduler_test.go b/pkg/scheduler/core/generic_scheduler_test.go
index 5cba063afc9..a1d501b4a59 100644
--- a/pkg/scheduler/core/generic_scheduler_test.go
+++ b/pkg/scheduler/core/generic_scheduler_test.go
@@ -58,8 +58,6 @@ import (
 
 var (
 	errPrioritize = fmt.Errorf("priority map encounters an error")
-	// TODO(Huang-Wei): remove 'order' and 'defer SetPredicatesOrderingDuringTest(order)()'.
-	order = []string{"FakeFilter", "FalseFilter", "TrueFilter", "MatchFilter", "NoPodsFilter", interpodaffinity.Name}
 )
 
 type trueFilterPlugin struct{}
@@ -367,8 +365,6 @@ func TestSelectHost(t *testing.T) {
 }
 
 func TestGenericScheduler(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
-
 	tests := []struct {
 		name            string
 		registerPlugins []st.RegisterPluginFunc
@@ -839,7 +835,6 @@ func makeScheduler(nodes []*v1.Node, fns ...st.RegisterPluginFunc) *genericSched
 }
 
 func TestFindFitAllError(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
 	nodes := makeNodeList([]string{"3", "2", "1"})
 	scheduler := makeScheduler(
 		nodes,
@@ -872,7 +867,6 @@ func TestFindFitAllError(t *testing.T) {
 }
 
 func TestFindFitSomeError(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
 	nodes := makeNodeList([]string{"3", "2", "1"})
 	scheduler := makeScheduler(
 		nodes,
@@ -909,8 +903,6 @@ func TestFindFitSomeError(t *testing.T) {
 }
 
 func TestFindFitPredicateCallCounts(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
-
 	tests := []struct {
 		name          string
 		pod           *v1.Pod
@@ -1284,8 +1276,6 @@ var startTime20190107 = metav1.Date(2019, 1, 7, 1, 1, 1, 0, time.UTC)
 // TestSelectNodesForPreemption tests selectNodesForPreemption. This test assumes
 // that podsFitsOnNode works correctly and is tested separately.
 func TestSelectNodesForPreemption(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
-
 	tests := []struct {
 		name                    string
 		registerPlugins         []st.RegisterPluginFunc
@@ -1295,7 +1285,6 @@ func TestSelectNodesForPreemption(t *testing.T) {
 		filterReturnCode        framework.Code
 		expected                map[string]map[string]bool // Map from node name to a list of pods names which should be preempted.
 		expectedNumFilterCalled int32
-		addAffinityPredicate    bool
 	}{
 		{
 			name: "a pod that does not fit on any machine",
@@ -1441,7 +1430,6 @@ func TestSelectNodesForPreemption(t *testing.T) {
 				{ObjectMeta: metav1.ObjectMeta{Name: "e", UID: types.UID("e")}, Spec: v1.PodSpec{Containers: largeContainers, Priority: &highPriority, NodeName: "machine2"}}},
 			expected:                map[string]map[string]bool{"machine1": {"a": true}, "machine2": {}},
 			expectedNumFilterCalled: 4,
-			addAffinityPredicate:    true,
 		},
 		{
 			name: "preemption to resolve even pods spread FitError",
@@ -1640,7 +1628,6 @@ func TestSelectNodesForPreemption(t *testing.T) {
 
 // TestPickOneNodeForPreemption tests pickOneNodeForPreemption.
 func TestPickOneNodeForPreemption(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
 	tests := []struct {
 		name                 string
 		registerFilterPlugin st.RegisterPluginFunc
@@ -1991,7 +1978,6 @@ func TestNodesWherePreemptionMightHelp(t *testing.T) {
 }
 
 func TestPreempt(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
 	defaultFailedNodeToStatusMap := framework.NodeToStatusMap{
 		"machine1": framework.NewStatus(framework.Unschedulable, algorithmpredicates.NewInsufficientResourceError(v1.ResourceMemory, 1000, 500, 300).GetReason()),
 		"machine2": framework.NewStatus(framework.Unschedulable, algorithmpredicates.ErrDiskConflict.GetReason()),
@@ -2451,7 +2437,6 @@ func assignDefaultStartTime(pods []*v1.Pod) {
 }
 
 func TestFairEvaluationForNodes(t *testing.T) {
-	defer algorithmpredicates.SetPredicatesOrderingDuringTest(order)()
 	numAllNodes := 500
 	nodeNames := make([]string, 0, numAllNodes)
 	for i := 0; i < numAllNodes; i++ {