github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86319 from Huang-Wei/fluffout-sched-tests

Browse Source 
Fix up the sub-test style
This commit is contained in:
Kubernetes Prow Robot 2019-12-17 04:20:32 -08:00 committed by GitHub
commit ec4f3e3064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/scheduler/algorithm/priorities/image_locality_test.go
View File

@ -202,18 +202,21 @@ func TestImageLocalityPriority(t *testing.T) {
func TestNormalizedImageName(t *testing.T) { func TestNormalizedImageName(t *testing.T) {
for _, testCase := range []struct { for _, testCase := range []struct {
Name string
Input string Input string
Output string Output string
}{ }{
{Input: "root", Output: "root:latest"}, {Name: "add :latest postfix 1", Input: "root", Output: "root:latest"},
{Input: "root:tag", Output: "root:tag"}, {Name: "add :latest postfix 2", Input: "gcr.io:5000/root", Output: "gcr.io:5000/root:latest"},
{Input: "gcr.io:5000/root", Output: "gcr.io:5000/root:latest"}, {Name: "keep it as is 1", Input: "root:tag", Output: "root:tag"},
{Input: "root@" + getImageFakeDigest("root"), Output: "root@" + getImageFakeDigest("root")}, {Name: "keep it as is 2", Input: "root@" + getImageFakeDigest("root"), Output: "root@" + getImageFakeDigest("root")},
} { } {
image := normalizedImageName(testCase.Input) t.Run(testCase.Name, func(t *testing.T) {
if image != testCase.Output { image := normalizedImageName(testCase.Input)
t.Errorf("expected image reference: %q, got %q", testCase.Output, image) if image != testCase.Output {
} t.Errorf("expected image reference: %q, got %q", testCase.Output, image)
}
})
} }
} }

69
pkg/scheduler/eventhandlers_test.go
View File

@ -28,7 +28,7 @@ import (
) )
func TestSkipPodUpdate(t *testing.T) { func TestSkipPodUpdate(t *testing.T) {
table := []struct { for _, test := range []struct {
pod *v1.Pod pod *v1.Pod
isAssumedPodFunc func(*v1.Pod) bool isAssumedPodFunc func(*v1.Pod) bool
getPodFunc func(*v1.Pod) *v1.Pod getPodFunc func(*v1.Pod) *v1.Pod
@ -102,8 +102,7 @@ func TestSkipPodUpdate(t *testing.T) {
}, },
expected: false, expected: false,
}, },
} } {
for _, test := range table {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
c := &Scheduler{ c := &Scheduler{
SchedulerCache: &fakecache.Cache{ SchedulerCache: &fakecache.Cache{
@ -123,7 +122,7 @@ func TestNodeAllocatableChanged(t *testing.T) {
newQuantity := func(value int64) resource.Quantity { newQuantity := func(value int64) resource.Quantity {
return *resource.NewQuantity(value, resource.BinarySI) return *resource.NewQuantity(value, resource.BinarySI)
} }
for _, c := range []struct { for _, test := range []struct {
Name string Name string
Changed bool Changed bool
OldAllocatable v1.ResourceList OldAllocatable v1.ResourceList
@ -142,17 +141,19 @@ func TestNodeAllocatableChanged(t *testing.T) {
NewAllocatable: v1.ResourceList{v1.ResourceMemory: newQuantity(1024), v1.ResourceStorage: newQuantity(1024)}, NewAllocatable: v1.ResourceList{v1.ResourceMemory: newQuantity(1024), v1.ResourceStorage: newQuantity(1024)},
}, },
} { } {
oldNode := &v1.Node{Status: v1.NodeStatus{Allocatable: c.OldAllocatable}} t.Run(test.Name, func(t *testing.T) {
newNode := &v1.Node{Status: v1.NodeStatus{Allocatable: c.NewAllocatable}} oldNode := &v1.Node{Status: v1.NodeStatus{Allocatable: test.OldAllocatable}}
changed := nodeAllocatableChanged(newNode, oldNode) newNode := &v1.Node{Status: v1.NodeStatus{Allocatable: test.NewAllocatable}}
if changed != c.Changed { changed := nodeAllocatableChanged(newNode, oldNode)
t.Errorf("nodeAllocatableChanged should be %t, got %t", c.Changed, changed) if changed != test.Changed {
} t.Errorf("nodeAllocatableChanged should be %t, got %t", test.Changed, changed)
}
})
} }
} }
func TestNodeLabelsChanged(t *testing.T) { func TestNodeLabelsChanged(t *testing.T) {
for _, c := range []struct { for _, test := range []struct {
Name string Name string
Changed bool Changed bool
OldLabels map[string]string OldLabels map[string]string
@ -172,17 +173,19 @@ func TestNodeLabelsChanged(t *testing.T) {
NewLabels: map[string]string{"foo": "bar", "test": "value"}, NewLabels: map[string]string{"foo": "bar", "test": "value"},
}, },
} { } {
oldNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: c.OldLabels}} t.Run(test.Name, func(t *testing.T) {
newNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: c.NewLabels}} oldNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: test.OldLabels}}
changed := nodeLabelsChanged(newNode, oldNode) newNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: test.NewLabels}}
if changed != c.Changed { changed := nodeLabelsChanged(newNode, oldNode)
t.Errorf("Test case %q failed: should be %t, got %t", c.Name, c.Changed, changed) if changed != test.Changed {
} t.Errorf("Test case %q failed: should be %t, got %t", test.Name, test.Changed, changed)
}
})
} }
} }
func TestNodeTaintsChanged(t *testing.T) { func TestNodeTaintsChanged(t *testing.T) {
for _, c := range []struct { for _, test := range []struct {
Name string Name string
Changed bool Changed bool
OldTaints []v1.Taint OldTaints []v1.Taint
@ -201,12 +204,14 @@ func TestNodeTaintsChanged(t *testing.T) {
NewTaints: []v1.Taint{{Key: "key", Value: "value2"}}, NewTaints: []v1.Taint{{Key: "key", Value: "value2"}},
}, },
} { } {
oldNode := &v1.Node{Spec: v1.NodeSpec{Taints: c.OldTaints}} t.Run(test.Name, func(t *testing.T) {
newNode := &v1.Node{Spec: v1.NodeSpec{Taints: c.NewTaints}} oldNode := &v1.Node{Spec: v1.NodeSpec{Taints: test.OldTaints}}
changed := nodeTaintsChanged(newNode, oldNode) newNode := &v1.Node{Spec: v1.NodeSpec{Taints: test.NewTaints}}
if changed != c.Changed { changed := nodeTaintsChanged(newNode, oldNode)
t.Errorf("Test case %q failed: should be %t, not %t", c.Name, c.Changed, changed) if changed != test.Changed {
} t.Errorf("Test case %q failed: should be %t, not %t", test.Name, test.Changed, changed)
}
})
} }
} }
@ -216,7 +221,7 @@ func TestNodeConditionsChanged(t *testing.T) {
t.Errorf("NodeCondition type has changed. The nodeConditionsChanged() function must be reevaluated.") t.Errorf("NodeCondition type has changed. The nodeConditionsChanged() function must be reevaluated.")
} }
for _, c := range []struct { for _, test := range []struct {
Name string Name string
Changed bool Changed bool
OldConditions []v1.NodeCondition OldConditions []v1.NodeCondition
@ -253,11 +258,13 @@ func TestNodeConditionsChanged(t *testing.T) {
NewConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionTrue}}, NewConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionTrue}},
}, },
} { } {
oldNode := &v1.Node{Status: v1.NodeStatus{Conditions: c.OldConditions}} t.Run(test.Name, func(t *testing.T) {
newNode := &v1.Node{Status: v1.NodeStatus{Conditions: c.NewConditions}} oldNode := &v1.Node{Status: v1.NodeStatus{Conditions: test.OldConditions}}
changed := nodeConditionsChanged(newNode, oldNode) newNode := &v1.Node{Status: v1.NodeStatus{Conditions: test.NewConditions}}
if changed != c.Changed { changed := nodeConditionsChanged(newNode, oldNode)
t.Errorf("Test case %q failed: should be %t, got %t", c.Name, c.Changed, changed) if changed != test.Changed {
} t.Errorf("Test case %q failed: should be %t, got %t", test.Name, test.Changed, changed)
}
})
} }
} }