diff --git a/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go b/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go index 2624bf519..2609dc7ef 100644 --- a/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go +++ b/pkg/framework/plugins/nodeutilization/highnodeutilization_test.go @@ -236,9 +236,7 @@ func TestHighNodeUtilization(t *testing.T) { test.SetRSOwnerRef(pod) test.MakeBestEffortPod(pod) }), - test.BuildTestPod("p2", 400, 0, n1NodeName, func(pod *v1.Pod) { - test.SetRSOwnerRef(pod) - }), + test.BuildTestPod("p2", 400, 0, n1NodeName, test.SetRSOwnerRef), // These won't be evicted. test.BuildTestPod("p3", 400, 0, n2NodeName, test.SetRSOwnerRef), test.BuildTestPod("p4", 400, 0, n2NodeName, test.SetRSOwnerRef), @@ -453,9 +451,7 @@ func TestHighNodeUtilization(t *testing.T) { // pods in the other nodes must not be evicted // because they do not have the extended // resource defined in their requests. - test.BuildTestPod("p3", 500, 0, n2NodeName, func(pod *v1.Pod) { - test.SetRSOwnerRef(pod) - }), + test.BuildTestPod("p3", 500, 0, n2NodeName, test.SetRSOwnerRef), test.BuildTestPod("p4", 500, 0, n2NodeName, func(pod *v1.Pod) { test.SetRSOwnerRef(pod) }), diff --git a/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go b/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go index 12fc1f88f..3c890d678 100644 --- a/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go +++ b/pkg/framework/plugins/nodeutilization/lownodeutilization_test.go @@ -458,9 +458,7 @@ func TestLowNodeUtilization(t *testing.T) { test.SetRSOwnerRef(pod) test.MakeBestEffortPod(pod) }), - test.BuildTestPod("p3", 400, 0, n1NodeName, func(pod *v1.Pod) { - test.SetRSOwnerRef(pod) - }), + test.BuildTestPod("p3", 400, 0, n1NodeName, test.SetRSOwnerRef), test.BuildTestPod("p4", 400, 0, n1NodeName, func(pod *v1.Pod) { test.SetRSOwnerRef(pod) test.MakeBestEffortPod(pod) @@ -470,9 +468,7 @@ func TestLowNodeUtilization(t *testing.T) { test.MakeBestEffortPod(pod) }), // These won't be evicted. - test.BuildTestPod("p6", 400, 0, n1NodeName, func(pod *v1.Pod) { - test.SetDSOwnerRef(pod) - }), + test.BuildTestPod("p6", 400, 0, n1NodeName, test.SetDSOwnerRef), test.BuildTestPod("p7", 400, 0, n1NodeName, func(pod *v1.Pod) { // A pod with local storage. test.SetNormalOwnerRef(pod) @@ -658,12 +654,8 @@ func TestLowNodeUtilization(t *testing.T) { test.SetRSOwnerRef(pod) test.SetPodExtendedResourceRequest(pod, extendedResource, 7) }), - test.BuildTestPod("p3", 0, 0, n2NodeName, func(pod *v1.Pod) { - test.SetRSOwnerRef(pod) - }), - test.BuildTestPod("p8", 0, 0, n3NodeName, func(pod *v1.Pod) { - test.SetRSOwnerRef(pod) - }), + test.BuildTestPod("p3", 0, 0, n2NodeName, test.SetRSOwnerRef), + test.BuildTestPod("p8", 0, 0, n3NodeName, test.SetRSOwnerRef), test.BuildTestPod("p9", 0, 0, n3NodeName, test.SetRSOwnerRef), }, nodemetricses: []*v1beta1.NodeMetrics{ diff --git a/pkg/framework/plugins/removeduplicates/removeduplicates_test.go b/pkg/framework/plugins/removeduplicates/removeduplicates_test.go index cfe01ae3d..8cb772e49 100644 --- a/pkg/framework/plugins/removeduplicates/removeduplicates_test.go +++ b/pkg/framework/plugins/removeduplicates/removeduplicates_test.go @@ -144,9 +144,7 @@ func TestFindDuplicatePods(t *testing.T) { { description: "Pods are: part of DaemonSet, with local storage, mirror pod annotation, critical pod annotation - none should be evicted.", pods: []*v1.Pod{ - buildTestPodForNode("p4", nodeName1, func(pod *v1.Pod) { - test.SetDSOwnerRef(pod) - }), + buildTestPodForNode("p4", nodeName1, test.SetDSOwnerRef), buildTestPodForNode("p5", nodeName1, func(pod *v1.Pod) { test.SetNormalOwnerRef(pod) test.SetHostPathEmptyDirVolumeSource(pod) @@ -171,9 +169,7 @@ func TestFindDuplicatePods(t *testing.T) { buildTestPodWithRSOwnerRefWithNamespaceForNode1("p1", "dev", nil), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p2", "dev", nil), buildTestPodWithRSOwnerRefWithNamespaceForNode1("p3", "dev", nil), - buildTestPodForNode("p4", nodeName1, func(pod *v1.Pod) { - test.SetDSOwnerRef(pod) - }), + buildTestPodForNode("p4", nodeName1, test.SetDSOwnerRef), buildTestPodForNode("p5", nodeName1, func(pod *v1.Pod) { test.SetNormalOwnerRef(pod) test.SetHostPathEmptyDirVolumeSource(pod)