From bedd0839a16a9b423324d91d4750ecb8a7a1ce94 Mon Sep 17 00:00:00 2001
From: AllenZMC <zhongming.chang@daocloud.io>
Date: Thu, 5 May 2022 22:58:41 +0800
Subject: [PATCH] Optimize test cases for kubelet

---
 pkg/kubelet/kubelet_test.go | 62 +++++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
index e8c2d06f1df..f1d48a1d524 100644
--- a/pkg/kubelet/kubelet_test.go
+++ b/pkg/kubelet/kubelet_test.go
@@ -748,7 +748,7 @@ func TestHandlePortConflicts(t *testing.T) {
 	recorder := record.NewFakeRecorder(20)
 	nodeRef := &v1.ObjectReference{
 		Kind:      "Node",
-		Name:      string("testNode"),
+		Name:      "testNode",
 		UID:       types.UID("testNode"),
 		Namespace: "",
 	}
@@ -798,7 +798,7 @@ func TestHandleHostNameConflicts(t *testing.T) {
 	recorder := record.NewFakeRecorder(20)
 	nodeRef := &v1.ObjectReference{
 		Kind:      "Node",
-		Name:      string("testNode"),
+		Name:      "testNode",
 		UID:       types.UID("testNode"),
 		Namespace: "",
 	}
@@ -841,7 +841,7 @@ func TestHandleNodeSelector(t *testing.T) {
 	recorder := record.NewFakeRecorder(20)
 	nodeRef := &v1.ObjectReference{
 		Kind:      "Node",
-		Name:      string("testNode"),
+		Name:      "testNode",
 		UID:       types.UID("testNode"),
 		Namespace: "",
 	}
@@ -911,7 +911,7 @@ func TestHandleNodeSelectorBasedOnOS(t *testing.T) {
 			recorder := record.NewFakeRecorder(20)
 			nodeRef := &v1.ObjectReference{
 				Kind:      "Node",
-				Name:      string("testNode"),
+				Name:      "testNode",
 				UID:       types.UID("testNode"),
 				Namespace: "",
 			}
@@ -946,7 +946,7 @@ func TestHandleMemExceeded(t *testing.T) {
 	recorder := record.NewFakeRecorder(20)
 	nodeRef := &v1.ObjectReference{
 		Kind:      "Node",
-		Name:      string("testNode"),
+		Name:      "testNode",
 		UID:       types.UID("testNode"),
 		Namespace: "",
 	}
@@ -1044,7 +1044,7 @@ func TestHandlePluginResources(t *testing.T) {
 	recorder := record.NewFakeRecorder(20)
 	nodeRef := &v1.ObjectReference{
 		Kind:      "Node",
-		Name:      string("testNode"),
+		Name:      "testNode",
 		UID:       types.UID("testNode"),
 		Namespace: "",
 	}
@@ -1290,24 +1290,40 @@ func TestValidateContainerLogStatus(t *testing.T) {
 }
 
 func TestCreateMirrorPod(t *testing.T) {
-	for _, updateType := range []kubetypes.SyncPodType{kubetypes.SyncPodCreate, kubetypes.SyncPodUpdate} {
-		testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
-		defer testKubelet.Cleanup()
+	tests := []struct {
+		name       string
+		updateType kubetypes.SyncPodType
+	}{
+		{
+			name:       "SyncPodCreate",
+			updateType: kubetypes.SyncPodCreate,
+		},
+		{
+			name:       "SyncPodUpdate",
+			updateType: kubetypes.SyncPodUpdate,
+		},
+	}
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.name, func(t *testing.T) {
+			testKubelet := newTestKubelet(t, false /* controllerAttachDetachEnabled */)
+			defer testKubelet.Cleanup()
 
-		kl := testKubelet.kubelet
-		manager := testKubelet.fakeMirrorClient
-		pod := podWithUIDNameNs("12345678", "bar", "foo")
-		pod.Annotations[kubetypes.ConfigSourceAnnotationKey] = "file"
-		pods := []*v1.Pod{pod}
-		kl.podManager.SetPods(pods)
-		isTerminal, err := kl.syncPod(context.Background(), updateType, pod, nil, &kubecontainer.PodStatus{})
-		assert.NoError(t, err)
-		if isTerminal {
-			t.Fatalf("pod should not be terminal: %#v", pod)
-		}
-		podFullName := kubecontainer.GetPodFullName(pod)
-		assert.True(t, manager.HasPod(podFullName), "Expected mirror pod %q to be created", podFullName)
-		assert.Equal(t, 1, manager.NumOfPods(), "Expected only 1 mirror pod %q, got %+v", podFullName, manager.GetPods())
+			kl := testKubelet.kubelet
+			manager := testKubelet.fakeMirrorClient
+			pod := podWithUIDNameNs("12345678", "bar", "foo")
+			pod.Annotations[kubetypes.ConfigSourceAnnotationKey] = "file"
+			pods := []*v1.Pod{pod}
+			kl.podManager.SetPods(pods)
+			isTerminal, err := kl.syncPod(context.Background(), tt.updateType, pod, nil, &kubecontainer.PodStatus{})
+			assert.NoError(t, err)
+			if isTerminal {
+				t.Fatalf("pod should not be terminal: %#v", pod)
+			}
+			podFullName := kubecontainer.GetPodFullName(pod)
+			assert.True(t, manager.HasPod(podFullName), "Expected mirror pod %q to be created", podFullName)
+			assert.Equal(t, 1, manager.NumOfPods(), "Expected only 1 mirror pod %q, got %+v", podFullName, manager.GetPods())
+		})
 	}
 }