github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use subtest for table units

Browse Source 
employ consitent table var naming

  - https://github.com/kubernetes/kubernetes/pull/63659#discussion_r187736533
This commit is contained in:
John Calabrese
2018-05-10 07:07:26 -04:00
parent 4da73a5f3d
commit d1abc5c824
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/scheduler/algorithm/priorities/util/non_zero_test.go
View File

@@ -26,7 +26,7 @@ import (
) )
func TestGetNonzeroRequests(t *testing.T) { func TestGetNonzeroRequests(t *testing.T) {
tds := []struct { tests := []struct {
name string name string
requests v1.ResourceList requests v1.ResourceList
expectedCPU int64 expectedCPU int64
@@ -65,9 +65,11 @@ func TestGetNonzeroRequests(t *testing.T) {
}, },
} }
for _, td := range tds { for _, test := range tests {
realCPU, realMemory := GetNonzeroRequests(&td.requests) t.Run(test.name, func(t *testing.T) {
assert.EqualValuesf(t, td.expectedCPU, realCPU, "Failed to test: %s", td.name) realCPU, realMemory := GetNonzeroRequests(&test.requests)
assert.EqualValuesf(t, td.expectedMemory, realMemory, "Failed to test: %s", td.name) assert.EqualValuesf(t, test.expectedCPU, realCPU, "Failed to test: %s", test.name)
assert.EqualValuesf(t, test.expectedMemory, realMemory, "Failed to test: %s", test.name)
})
} }
} }

24
pkg/scheduler/algorithm/priorities/util/topologies_test.go
View File

@@ -59,8 +59,10 @@ func TestGetNamespacesFromPodAffinityTerm(t *testing.T) {
} }
for _, test := range tests { for _, test := range tests {
realValue := GetNamespacesFromPodAffinityTerm(fakePod(), test.podAffinityTerm) t.Run(test.name, func(t *testing.T) {
assert.EqualValuesf(t, test.expectedValue, realValue, "Failed to test: %s", test.name) 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 { for _, test := range tests {
fakeTestPod := fakePod() t.Run(test.name, func(t *testing.T) {
fakeTestPod.Namespace = test.podNamespaces fakeTestPod := fakePod()
fakeTestPod.Labels = test.podLabels fakeTestPod.Namespace = test.podNamespaces
fakeTestPod.Labels = test.podLabels
realValue := PodMatchesTermsNamespaceAndSelector(fakeTestPod, fakeNamespaces, fakeSelector) realValue := PodMatchesTermsNamespaceAndSelector(fakeTestPod, fakeNamespaces, fakeSelector)
assert.EqualValuesf(t, test.expectedResult, realValue, "Faild to test: %s", test.name) 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 { for _, test := range tests {
got := NodesHaveSameTopologyKey(test.nodeA, test.nodeB, test.topologyKey) t.Run(test.name, func(t *testing.T) {
assert.Equalf(t, test.expected, got, "Failed to test: %s", test.name) got := NodesHaveSameTopologyKey(test.nodeA, test.nodeB, test.topologyKey)
assert.Equalf(t, test.expected, got, "Failed to test: %s", test.name)
})
} }
} }

14
pkg/scheduler/algorithm/priorities/util/util_test.go
View File

@@ -109,11 +109,13 @@ func TestGetControllerRef(t *testing.T) {
} }
for _, td := range tds { for _, td := range tds {
realOR := GetControllerRef(&td.pod) t.Run(td.name, func(t *testing.T) {
if td.expectedNil { realOR := GetControllerRef(&td.pod)
assert.Nilf(t, realOR, "Failed to test: %s", td.name) if td.expectedNil {
} else { assert.Nilf(t, realOR, "Failed to test: %s", td.name)
assert.Equalf(t, &td.expectedOR, realOR, "Failed to test: %s", td.name) } else {
} assert.Equalf(t, &td.expectedOR, realOR, "Failed to test: %s", td.name)
}
})
} }
} }