Merge pull request #102611 from ehashman/test-order

kubelet: Fix test order in verifyContainerStatuses
This commit is contained in:
Kubernetes Prow Robot 2021-06-08 00:29:11 -07:00 committed by GitHub
commit f7cff077d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1725,10 +1725,10 @@ func TestGenerateAPIPodStatusWithSortedContainers(t *testing.T) {
}
}
func verifyContainerStatuses(t *testing.T, statuses []v1.ContainerStatus, state, lastTerminationState map[string]v1.ContainerState, message string) {
func verifyContainerStatuses(t *testing.T, statuses []v1.ContainerStatus, expectedState, expectedLastTerminationState map[string]v1.ContainerState, message string) {
for _, s := range statuses {
assert.Equal(t, s.State, state[s.Name], "%s: state", message)
assert.Equal(t, s.LastTerminationState, lastTerminationState[s.Name], "%s: last terminated state", message)
assert.Equal(t, expectedState[s.Name], s.State, "%s: state", message)
assert.Equal(t, expectedLastTerminationState[s.Name], s.LastTerminationState, "%s: last terminated state", message)
}
}