From d7d7bfcda0d35b7f6599292c3050e428df9ef828 Mon Sep 17 00:00:00 2001 From: Kevin Klues Date: Mon, 4 Nov 2019 15:11:52 +0100 Subject: [PATCH] Abstract TopologyManager Policy Merge() tests into their own function --- .../cm/topologymanager/topology_manager_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/kubelet/cm/topologymanager/topology_manager_test.go b/pkg/kubelet/cm/topologymanager/topology_manager_test.go index 49c4e1cea88..e5752885b15 100644 --- a/pkg/kubelet/cm/topologymanager/topology_manager_test.go +++ b/pkg/kubelet/cm/topologymanager/topology_manager_test.go @@ -104,7 +104,7 @@ func TestGetAffinity(t *testing.T) { } } -func TestCalculateAffinity(t *testing.T) { +func TestPolicyMerge(t *testing.T) { numaNodes := []int{0, 1} tcases := []struct { @@ -745,11 +745,13 @@ func TestCalculateAffinity(t *testing.T) { } for _, tc := range tcases { - mngr := manager{ - policy: tc.policy, - hintProviders: tc.hp, + var providersHints []map[string][]TopologyHint + for _, provider := range tc.hp { + hints := provider.GetTopologyHints(v1.Pod{}, v1.Container{}) + providersHints = append(providersHints, hints) } - actual, _ := mngr.calculateAffinity(v1.Pod{}, v1.Container{}) + + actual, _ := tc.policy.Merge(providersHints) if !actual.NUMANodeAffinity.IsEqual(tc.expected.NUMANodeAffinity) { t.Errorf("Expected NUMANodeAffinity in result to be %v, got %v", tc.expected.NUMANodeAffinity, actual.NUMANodeAffinity) }