Skip to content

Commit b5b2171

Browse files
authored
Merge pull request kubernetes#126427 from pacoxu/fix-TestUpdateAllocatedResourcesStatus
ignore order of containers status allocated resources
2 parents e8588e6 + 78d3830 commit b5b2171

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

pkg/kubelet/cm/devicemanager/manager_test.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"path/filepath"
2323
"reflect"
2424
goruntime "runtime"
25+
"sort"
2526
"sync"
2627
"sync/atomic"
2728
"testing"
@@ -1927,7 +1928,28 @@ func TestUpdateAllocatedResourcesStatus(t *testing.T) {
19271928
AllocatedResourcesStatus: []v1.ResourceStatus{expectedStatus},
19281929
},
19291930
}
1931+
1932+
// Sort the resources for the expected status and actual status
1933+
sortContainerStatuses(status.ContainerStatuses)
1934+
sortContainerStatuses(expectedContainerStatuses)
1935+
19301936
if !reflect.DeepEqual(status.ContainerStatuses, expectedContainerStatuses) {
19311937
t.Errorf("UpdateAllocatedResourcesStatus failed, expected: %v, got: %v", expectedContainerStatuses, status.ContainerStatuses)
19321938
}
19331939
}
1940+
1941+
// Helper function to sort ResourceHealth slices
1942+
func sortResourceHealth(resources []v1.ResourceHealth) {
1943+
sort.SliceStable(resources, func(i, j int) bool {
1944+
return resources[i].ResourceID < resources[j].ResourceID
1945+
})
1946+
}
1947+
1948+
// Helper function to sort ContainerStatus slices
1949+
func sortContainerStatuses(statuses []v1.ContainerStatus) {
1950+
for i := range statuses {
1951+
for j := range statuses[i].AllocatedResourcesStatus {
1952+
sortResourceHealth(statuses[i].AllocatedResourcesStatus[j].Resources)
1953+
}
1954+
}
1955+
}

0 commit comments

Comments
 (0)