diff --git a/pkg/scheduler/algorithm/priorities/util/non_zero_test.go b/pkg/scheduler/algorithm/priorities/util/non_zero_test.go index 8be7e4ac94..001b65ca19 100644 --- a/pkg/scheduler/algorithm/priorities/util/non_zero_test.go +++ b/pkg/scheduler/algorithm/priorities/util/non_zero_test.go @@ -26,7 +26,7 @@ import ( ) func TestGetNonzeroRequests(t *testing.T) { - tds := []struct { + tests := []struct { name string requests v1.ResourceList expectedCPU int64 @@ -65,9 +65,11 @@ func TestGetNonzeroRequests(t *testing.T) { }, } - for _, td := range tds { - realCPU, realMemory := GetNonzeroRequests(&td.requests) - assert.EqualValuesf(t, td.expectedCPU, realCPU, "Failed to test: %s", td.name) - assert.EqualValuesf(t, td.expectedMemory, realMemory, "Failed to test: %s", td.name) + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + realCPU, realMemory := GetNonzeroRequests(&test.requests) + assert.EqualValuesf(t, test.expectedCPU, realCPU, "Failed to test: %s", test.name) + assert.EqualValuesf(t, test.expectedMemory, realMemory, "Failed to test: %s", test.name) + }) } } diff --git a/pkg/scheduler/algorithm/priorities/util/topologies_test.go b/pkg/scheduler/algorithm/priorities/util/topologies_test.go index 25e24299f8..6aee723e46 100644 --- a/pkg/scheduler/algorithm/priorities/util/topologies_test.go +++ b/pkg/scheduler/algorithm/priorities/util/topologies_test.go @@ -59,8 +59,10 @@ func TestGetNamespacesFromPodAffinityTerm(t *testing.T) { } for _, test := range tests { - realValue := GetNamespacesFromPodAffinityTerm(fakePod(), test.podAffinityTerm) - assert.EqualValuesf(t, test.expectedValue, realValue, "Failed to test: %s", test.name) + t.Run(test.name, func(t *testing.T) { + realValue := GetNamespacesFromPodAffinityTerm(fakePod(), test.podAffinityTerm) + assert.EqualValuesf(t, test.expectedValue, realValue, "Failed to test: %s", test.name) + }) } } @@ -96,12 +98,14 @@ func TestPodMatchesTermsNamespaceAndSelector(t *testing.T) { } for _, test := range tests { - fakeTestPod := fakePod() - fakeTestPod.Namespace = test.podNamespaces - fakeTestPod.Labels = test.podLabels + t.Run(test.name, func(t *testing.T) { + fakeTestPod := fakePod() + fakeTestPod.Namespace = test.podNamespaces + fakeTestPod.Labels = test.podLabels - realValue := PodMatchesTermsNamespaceAndSelector(fakeTestPod, fakeNamespaces, fakeSelector) - assert.EqualValuesf(t, test.expectedResult, realValue, "Faild to test: %s", test.name) + realValue := PodMatchesTermsNamespaceAndSelector(fakeTestPod, fakeNamespaces, fakeSelector) + assert.EqualValuesf(t, test.expectedResult, realValue, "Faild to test: %s", test.name) + }) } } @@ -248,7 +252,9 @@ func TestNodesHaveSameTopologyKey(t *testing.T) { } for _, test := range tests { - got := NodesHaveSameTopologyKey(test.nodeA, test.nodeB, test.topologyKey) - assert.Equalf(t, test.expected, got, "Failed to test: %s", test.name) + t.Run(test.name, func(t *testing.T) { + got := NodesHaveSameTopologyKey(test.nodeA, test.nodeB, test.topologyKey) + assert.Equalf(t, test.expected, got, "Failed to test: %s", test.name) + }) } } diff --git a/pkg/scheduler/algorithm/priorities/util/util_test.go b/pkg/scheduler/algorithm/priorities/util/util_test.go index fc79ebbfc4..b4f0fc0aa5 100644 --- a/pkg/scheduler/algorithm/priorities/util/util_test.go +++ b/pkg/scheduler/algorithm/priorities/util/util_test.go @@ -109,11 +109,13 @@ func TestGetControllerRef(t *testing.T) { } for _, td := range tds { - realOR := GetControllerRef(&td.pod) - if td.expectedNil { - assert.Nilf(t, realOR, "Failed to test: %s", td.name) - } else { - assert.Equalf(t, &td.expectedOR, realOR, "Failed to test: %s", td.name) - } + t.Run(td.name, func(t *testing.T) { + realOR := GetControllerRef(&td.pod) + if td.expectedNil { + assert.Nilf(t, realOR, "Failed to test: %s", td.name) + } else { + assert.Equalf(t, &td.expectedOR, realOR, "Failed to test: %s", td.name) + } + }) } }