From 82afa2bbafcf4deae9be3886809e9509ed43728c Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Mon, 16 Dec 2019 11:28:12 -0800 Subject: [PATCH] Fix up the sub-test style --- .../priorities/image_locality_test.go | 19 ++--- pkg/scheduler/eventhandlers_test.go | 69 ++++++++++--------- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/pkg/scheduler/algorithm/priorities/image_locality_test.go b/pkg/scheduler/algorithm/priorities/image_locality_test.go index e79c8e3aac3..373ef2734ea 100644 --- a/pkg/scheduler/algorithm/priorities/image_locality_test.go +++ b/pkg/scheduler/algorithm/priorities/image_locality_test.go @@ -202,18 +202,21 @@ func TestImageLocalityPriority(t *testing.T) { func TestNormalizedImageName(t *testing.T) { for _, testCase := range []struct { + Name string Input string Output string }{ - {Input: "root", Output: "root:latest"}, - {Input: "root:tag", Output: "root:tag"}, - {Input: "gcr.io:5000/root", Output: "gcr.io:5000/root:latest"}, - {Input: "root@" + getImageFakeDigest("root"), Output: "root@" + getImageFakeDigest("root")}, + {Name: "add :latest postfix 1", Input: "root", Output: "root:latest"}, + {Name: "add :latest postfix 2", Input: "gcr.io:5000/root", Output: "gcr.io:5000/root:latest"}, + {Name: "keep it as is 1", Input: "root:tag", Output: "root:tag"}, + {Name: "keep it as is 2", Input: "root@" + getImageFakeDigest("root"), Output: "root@" + getImageFakeDigest("root")}, } { - image := normalizedImageName(testCase.Input) - if image != testCase.Output { - t.Errorf("expected image reference: %q, got %q", testCase.Output, image) - } + t.Run(testCase.Name, func(t *testing.T) { + image := normalizedImageName(testCase.Input) + if image != testCase.Output { + t.Errorf("expected image reference: %q, got %q", testCase.Output, image) + } + }) } } diff --git a/pkg/scheduler/eventhandlers_test.go b/pkg/scheduler/eventhandlers_test.go index fe6ba7abb0a..0b47cc92dd3 100644 --- a/pkg/scheduler/eventhandlers_test.go +++ b/pkg/scheduler/eventhandlers_test.go @@ -28,7 +28,7 @@ import ( ) func TestSkipPodUpdate(t *testing.T) { - table := []struct { + for _, test := range []struct { pod *v1.Pod isAssumedPodFunc func(*v1.Pod) bool getPodFunc func(*v1.Pod) *v1.Pod @@ -102,8 +102,7 @@ func TestSkipPodUpdate(t *testing.T) { }, expected: false, }, - } - for _, test := range table { + } { t.Run(test.name, func(t *testing.T) { c := &Scheduler{ SchedulerCache: &fakecache.Cache{ @@ -123,7 +122,7 @@ func TestNodeAllocatableChanged(t *testing.T) { newQuantity := func(value int64) resource.Quantity { return *resource.NewQuantity(value, resource.BinarySI) } - for _, c := range []struct { + for _, test := range []struct { Name string Changed bool OldAllocatable v1.ResourceList @@ -142,17 +141,19 @@ func TestNodeAllocatableChanged(t *testing.T) { NewAllocatable: v1.ResourceList{v1.ResourceMemory: newQuantity(1024), v1.ResourceStorage: newQuantity(1024)}, }, } { - oldNode := &v1.Node{Status: v1.NodeStatus{Allocatable: c.OldAllocatable}} - newNode := &v1.Node{Status: v1.NodeStatus{Allocatable: c.NewAllocatable}} - changed := nodeAllocatableChanged(newNode, oldNode) - if changed != c.Changed { - t.Errorf("nodeAllocatableChanged should be %t, got %t", c.Changed, changed) - } + t.Run(test.Name, func(t *testing.T) { + oldNode := &v1.Node{Status: v1.NodeStatus{Allocatable: test.OldAllocatable}} + newNode := &v1.Node{Status: v1.NodeStatus{Allocatable: test.NewAllocatable}} + changed := nodeAllocatableChanged(newNode, oldNode) + if changed != test.Changed { + t.Errorf("nodeAllocatableChanged should be %t, got %t", test.Changed, changed) + } + }) } } func TestNodeLabelsChanged(t *testing.T) { - for _, c := range []struct { + for _, test := range []struct { Name string Changed bool OldLabels map[string]string @@ -172,17 +173,19 @@ func TestNodeLabelsChanged(t *testing.T) { NewLabels: map[string]string{"foo": "bar", "test": "value"}, }, } { - oldNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: c.OldLabels}} - newNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: c.NewLabels}} - changed := nodeLabelsChanged(newNode, oldNode) - if changed != c.Changed { - t.Errorf("Test case %q failed: should be %t, got %t", c.Name, c.Changed, changed) - } + t.Run(test.Name, func(t *testing.T) { + oldNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: test.OldLabels}} + newNode := &v1.Node{ObjectMeta: metav1.ObjectMeta{Labels: test.NewLabels}} + changed := nodeLabelsChanged(newNode, oldNode) + 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) { - for _, c := range []struct { + for _, test := range []struct { Name string Changed bool OldTaints []v1.Taint @@ -201,12 +204,14 @@ func TestNodeTaintsChanged(t *testing.T) { NewTaints: []v1.Taint{{Key: "key", Value: "value2"}}, }, } { - oldNode := &v1.Node{Spec: v1.NodeSpec{Taints: c.OldTaints}} - newNode := &v1.Node{Spec: v1.NodeSpec{Taints: c.NewTaints}} - changed := nodeTaintsChanged(newNode, oldNode) - if changed != c.Changed { - t.Errorf("Test case %q failed: should be %t, not %t", c.Name, c.Changed, changed) - } + t.Run(test.Name, func(t *testing.T) { + oldNode := &v1.Node{Spec: v1.NodeSpec{Taints: test.OldTaints}} + newNode := &v1.Node{Spec: v1.NodeSpec{Taints: test.NewTaints}} + changed := nodeTaintsChanged(newNode, oldNode) + 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.") } - for _, c := range []struct { + for _, test := range []struct { Name string Changed bool OldConditions []v1.NodeCondition @@ -253,11 +258,13 @@ func TestNodeConditionsChanged(t *testing.T) { NewConditions: []v1.NodeCondition{{Type: v1.NodeReady, Status: v1.ConditionTrue}}, }, } { - oldNode := &v1.Node{Status: v1.NodeStatus{Conditions: c.OldConditions}} - newNode := &v1.Node{Status: v1.NodeStatus{Conditions: c.NewConditions}} - changed := nodeConditionsChanged(newNode, oldNode) - if changed != c.Changed { - t.Errorf("Test case %q failed: should be %t, got %t", c.Name, c.Changed, changed) - } + t.Run(test.Name, func(t *testing.T) { + oldNode := &v1.Node{Status: v1.NodeStatus{Conditions: test.OldConditions}} + newNode := &v1.Node{Status: v1.NodeStatus{Conditions: test.NewConditions}} + changed := nodeConditionsChanged(newNode, oldNode) + if changed != test.Changed { + t.Errorf("Test case %q failed: should be %t, got %t", test.Name, test.Changed, changed) + } + }) } }