Merge pull request kubernetes#130667 from Chulong-Li/fix

k8s-ci-robot · web-flow · commit 2ee063dae08b · 2025-03-20T11:24:56.000-07:00
Adjust the test logic on TestGetStaticPodToMirrorPodMap
diff --git a/pkg/kubelet/pod/pod_manager_test.go b/pkg/kubelet/pod/pod_manager_test.go
@@ -302,7 +302,11 @@ func TestGetStaticPodToMirrorPodMap(t *testing.T) {
 	if len(m) != 1 {
 		t.Fatalf("GetStaticPodToMirrorPodMap(): got %d static pods, wanted 1 static pod", len(m))
 	}
-	if gotMirrorPod, ok := m[staticPod]; !ok || gotMirrorPod.UID != mirrorPod.UID {
-		t.Fatalf("GetStaticPodToMirrorPodMap() did not return the correct mirror pod UID %s, wanted mirror pod UID %s", gotMirrorPod.UID, mirrorPod.UID)
+	gotMirrorPod, ok := m[staticPod]
+	if !ok {
+		t.Fatalf("GetStaticPodToMirrorPodMap(): mirror pod not found for staticPod %v", staticPod)
+	}
+	if gotMirrorPod.UID != mirrorPod.UID {
+		t.Fatalf("GetStaticPodToMirrorPodMap(): got UID %s, want %s", gotMirrorPod.UID, mirrorPod.UID)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,11 @@ func TestGetStaticPodToMirrorPodMap(t *testing.T) {`
`302`	`302`	`if len(m) != 1 {`
`303`	`303`	`t.Fatalf("GetStaticPodToMirrorPodMap(): got %d static pods, wanted 1 static pod", len(m))`
`304`	`304`	`}`
`305`		`- if gotMirrorPod, ok := m[staticPod]; !ok \|\| gotMirrorPod.UID != mirrorPod.UID {`
`306`		`- t.Fatalf("GetStaticPodToMirrorPodMap() did not return the correct mirror pod UID %s, wanted mirror pod UID %s", gotMirrorPod.UID, mirrorPod.UID)`
	`305`	`+ gotMirrorPod, ok := m[staticPod]`
	`306`	`+ if !ok {`
	`307`	`+ t.Fatalf("GetStaticPodToMirrorPodMap(): mirror pod not found for staticPod %v", staticPod)`
	`308`	`+ }`
	`309`	`+ if gotMirrorPod.UID != mirrorPod.UID {`
	`310`	`+ t.Fatalf("GetStaticPodToMirrorPodMap(): got UID %s, want %s", gotMirrorPod.UID, mirrorPod.UID)`
`307`	`311`	`}`
`308`	`312`	`}`