github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 22:05:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #118965 from mengjiao-liu/use-cmp.Diff-scheduler-queue

Browse Source 
scheduler test: Use cmp.Diff instead of reflect.DeepEqual for pkg/scheduler/internal/queue/
This commit is contained in:
Kubernetes Prow Robot 2023-07-04 05:29:05 -07:00 committed by GitHub
commit 0852a2759a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/scheduler/internal/queue/scheduling_queue_test.go
View File

@ -20,7 +20,6 @@ import (
"context" "context"
"fmt" "fmt"
"math" "math"
"reflect"
"strings" "strings"
"sync" "sync"
"testing" "testing"
@ -230,8 +229,8 @@ func TestPriorityQueue_AddUnschedulableIfNotPresent_Backoff(t *testing.T) {
// Pop all pods except for the first one // Pop all pods except for the first one
for i := totalNum - 1; i > 0; i-- { for i := totalNum - 1; i > 0; i-- {
p, _ := q.Pop() p, _ := q.Pop()
if !reflect.DeepEqual(&expectedPods[i], p.Pod) { if diff := cmp.Diff(&expectedPods[i], p.Pod); diff != "" {
t.Errorf("Unexpected pod. Expected: %v, got: %v", &expectedPods[i], p) t.Errorf("Unexpected pod (-want, +got):\n%s", diff)
} }
} }
@ -240,8 +239,8 @@ func TestPriorityQueue_AddUnschedulableIfNotPresent_Backoff(t *testing.T) {
oldCycle := q.SchedulingCycle() oldCycle := q.SchedulingCycle()
firstPod, _ := q.Pop() firstPod, _ := q.Pop()
if !reflect.DeepEqual(&expectedPods[0], firstPod.Pod) { if diff := cmp.Diff(&expectedPods[0], firstPod.Pod); diff != "" {
t.Errorf("Unexpected pod. Expected: %v, got: %v", &expectedPods[0], firstPod) t.Errorf("Unexpected pod (-want, +got):\n%s", diff)
} }
// mark pods[1] ~ pods[totalNum-1] as unschedulable and add them back // mark pods[1] ~ pods[totalNum-1] as unschedulable and add them back
@ -962,8 +961,8 @@ func TestPriorityQueue_PendingPods(t *testing.T) {
expectedSet := makeSet([]*v1.Pod{medPriorityPodInfo.Pod, unschedulablePodInfo.Pod, highPriorityPodInfo.Pod}) expectedSet := makeSet([]*v1.Pod{medPriorityPodInfo.Pod, unschedulablePodInfo.Pod, highPriorityPodInfo.Pod})
gotPods, gotSummary := q.PendingPods() gotPods, gotSummary := q.PendingPods()
if !reflect.DeepEqual(expectedSet, makeSet(gotPods)) { if diff := cmp.Diff(expectedSet, makeSet(gotPods)); diff != "" {
t.Error("Unexpected list of pending Pods.") t.Errorf("Unexpected list of pending Pods (-want, +got):\n%s", diff)
} }
if wantSummary := fmt.Sprintf(pendingPodsSummary, 1, 0, 2); wantSummary != gotSummary { if wantSummary := fmt.Sprintf(pendingPodsSummary, 1, 0, 2); wantSummary != gotSummary {
t.Errorf("Unexpected pending pods summary: want %v, but got %v.", wantSummary, gotSummary) t.Errorf("Unexpected pending pods summary: want %v, but got %v.", wantSummary, gotSummary)
@ -971,8 +970,8 @@ func TestPriorityQueue_PendingPods(t *testing.T) {
// Move all to active queue. We should still see the same set of pods. // Move all to active queue. We should still see the same set of pods.
q.MoveAllToActiveOrBackoffQueue(logger, TestEvent, nil, nil, nil) q.MoveAllToActiveOrBackoffQueue(logger, TestEvent, nil, nil, nil)
gotPods, gotSummary = q.PendingPods() gotPods, gotSummary = q.PendingPods()
if !reflect.DeepEqual(expectedSet, makeSet(gotPods)) { if diff := cmp.Diff(expectedSet, makeSet(gotPods)); diff != "" {
t.Error("Unexpected list of pending Pods.") t.Errorf("Unexpected list of pending Pods (-want, +got):\n%s", diff)
} }
if wantSummary := fmt.Sprintf(pendingPodsSummary, 1, 2, 0); wantSummary != gotSummary { if wantSummary := fmt.Sprintf(pendingPodsSummary, 1, 2, 0); wantSummary != gotSummary {
t.Errorf("Unexpected pending pods summary: want %v, but got %v.", wantSummary, gotSummary) t.Errorf("Unexpected pending pods summary: want %v, but got %v.", wantSummary, gotSummary)
@ -1170,26 +1169,23 @@ func TestUnschedulablePodsMap(t *testing.T) {
for _, p := range test.podsToAdd { for _, p := range test.podsToAdd {
upm.addOrUpdate(newQueuedPodInfoForLookup(p)) upm.addOrUpdate(newQueuedPodInfoForLookup(p))
} }
if !reflect.DeepEqual(upm.podInfoMap, test.expectedMapAfterAdd) { if diff := cmp.Diff(test.expectedMapAfterAdd, upm.podInfoMap); diff != "" {
t.Errorf("Unexpected map after adding pods. Expected: %v, got: %v", t.Errorf("Unexpected map after adding pods(-want, +got):\n%s", diff)
test.expectedMapAfterAdd, upm.podInfoMap)
} }
if len(test.podsToUpdate) > 0 { if len(test.podsToUpdate) > 0 {
for _, p := range test.podsToUpdate { for _, p := range test.podsToUpdate {
upm.addOrUpdate(newQueuedPodInfoForLookup(p)) upm.addOrUpdate(newQueuedPodInfoForLookup(p))
} }
if !reflect.DeepEqual(upm.podInfoMap, test.expectedMapAfterUpdate) { if diff := cmp.Diff(test.expectedMapAfterUpdate, upm.podInfoMap); diff != "" {
t.Errorf("Unexpected map after updating pods. Expected: %v, got: %v", t.Errorf("Unexpected map after updating pods (-want, +got):\n%s", diff)
test.expectedMapAfterUpdate, upm.podInfoMap)
} }
} }
for _, p := range test.podsToDelete { for _, p := range test.podsToDelete {
upm.delete(p, false) upm.delete(p, false)
} }
if !reflect.DeepEqual(upm.podInfoMap, test.expectedMapAfterDelete) { if diff := cmp.Diff(test.expectedMapAfterDelete, upm.podInfoMap); diff != "" {
t.Errorf("Unexpected map after deleting pods. Expected: %v, got: %v", t.Errorf("Unexpected map after deleting pods (-want, +got):\n%s", diff)
test.expectedMapAfterDelete, upm.podInfoMap)
} }
upm.clear() upm.clear()
if len(upm.podInfoMap) != 0 { if len(upm.podInfoMap) != 0 {
@ -1658,9 +1654,8 @@ func TestPodTimestamp(t *testing.T) {
} }
} }
if !reflect.DeepEqual(test.expected, podInfoList) { if diff := cmp.Diff(test.expected, podInfoList); diff != "" {
t.Errorf("Unexpected QueuedPodInfo list. Expected: %v, got: %v", t.Errorf("Unexpected QueuedPodInfo list (-want, +got):\n%s", diff)
test.expected, podInfoList)
} }
}) })
} }