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

Merge pull request #126427 from pacoxu/fix-TestUpdateAllocatedResourcesStatus

Browse Source 
ignore order of containers status allocated resources
This commit is contained in:
Kubernetes Prow Robot 2024-07-29 15:54:07 -07:00 committed by GitHub
commit b5b21717ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubelet/cm/devicemanager/manager_test.go
View File

@ -22,6 +22,7 @@ import (
"path/filepath"
"reflect"
goruntime "runtime"
"sort"
"sync"
"sync/atomic"
"testing"
@ -1927,7 +1928,28 @@ func TestUpdateAllocatedResourcesStatus(t *testing.T) {
AllocatedResourcesStatus: []v1.ResourceStatus{expectedStatus},
},
}
// Sort the resources for the expected status and actual status
sortContainerStatuses(status.ContainerStatuses)
sortContainerStatuses(expectedContainerStatuses)
if !reflect.DeepEqual(status.ContainerStatuses, expectedContainerStatuses) {
t.Errorf("UpdateAllocatedResourcesStatus failed, expected: %v, got: %v", expectedContainerStatuses, status.ContainerStatuses)
}
}
// Helper function to sort ResourceHealth slices
func sortResourceHealth(resources []v1.ResourceHealth) {
sort.SliceStable(resources, func(i, j int) bool {
return resources[i].ResourceID < resources[j].ResourceID
})
}
// Helper function to sort ContainerStatus slices
func sortContainerStatuses(statuses []v1.ContainerStatus) {
for i := range statuses {
for j := range statuses[i].AllocatedResourcesStatus {
sortResourceHealth(statuses[i].AllocatedResourcesStatus[j].Resources)
}
}
}