From 6180d701cc39351ea2571fc84813aad0b752c528 Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Fri, 17 Apr 2020 09:24:45 +0800 Subject: [PATCH] /pkg/scheduler/framework/plugins/ : remove the repeat test example and add an test example --- .../default_pod_topology_spread_test.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/scheduler/framework/plugins/defaultpodtopologyspread/default_pod_topology_spread_test.go b/pkg/scheduler/framework/plugins/defaultpodtopologyspread/default_pod_topology_spread_test.go index 2ea075b02cf..feec7694b1d 100644 --- a/pkg/scheduler/framework/plugins/defaultpodtopologyspread/default_pod_topology_spread_test.go +++ b/pkg/scheduler/framework/plugins/defaultpodtopologyspread/default_pod_topology_spread_test.go @@ -578,19 +578,20 @@ func TestZoneSelectorSpreadPriority(t *testing.T) { pods: []*v1.Pod{ buildPod(nodeMachine1Zone1, labels1, nil), buildPod(nodeMachine1Zone2, labels1, nil), - buildPod(nodeMachine1Zone3, labels1, nil), + buildPod(nodeMachine2Zone2, labels1, nil), buildPod(nodeMachine2Zone2, labels2, nil), + buildPod(nodeMachine1Zone3, labels1, nil), }, services: []*v1.Service{{Spec: v1.ServiceSpec{Selector: labels1}}}, expectedList: []framework.NodeScore{ - {Name: nodeMachine1Zone1, Score: 0}, // Pod on node + {Name: nodeMachine1Zone1, Score: 33}, // Pod on node {Name: nodeMachine1Zone2, Score: 0}, // Pod on node - {Name: nodeMachine2Zone2, Score: 33}, // Pod in zone - {Name: nodeMachine1Zone3, Score: 0}, // Pod on node - {Name: nodeMachine2Zone3, Score: 33}, // Pod in zone - {Name: nodeMachine3Zone3, Score: 33}, // Pod in zone + {Name: nodeMachine2Zone2, Score: 0}, // Pod in zone + {Name: nodeMachine1Zone3, Score: 33}, // Pod on node + {Name: nodeMachine2Zone3, Score: 66}, // Pod in zone + {Name: nodeMachine3Zone3, Score: 66}, // Pod in zone }, - name: "four pods, 3 matching (z1=1, z2=1, z3=1)", + name: "five pods, 4 matching (z1=1, z2=2, z3=1)", }, { pod: buildPod("", labels1, controllerRef("ReplicationController", "name", "abc123")),