Merge pull request #83190 from deads2k/prove-generic-count-pod

add test to show generic pod count counts all pods
This commit is contained in:
Kubernetes Prow Robot 2019-09-26 13:03:20 -07:00 committed by GitHub
commit e89827f79b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -275,6 +275,24 @@ func TestPodEvaluatorUsage(t *testing.T) {
generic.ObjectCountQuotaResourceNameFor(schema.GroupResource{Resource: "pods"}): resource.MustParse("1"),
},
},
"terminated generic count still appears": {
pod: &api.Pod{
Spec: api.PodSpec{
Containers: []api.Container{{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{api.ResourceName("example.com/dongle"): resource.MustParse("3")},
Limits: api.ResourceList{api.ResourceName("example.com/dongle"): resource.MustParse("3")},
},
}},
},
Status: api.PodStatus{
Phase: api.PodSucceeded,
},
},
usage: corev1.ResourceList{
generic.ObjectCountQuotaResourceNameFor(schema.GroupResource{Resource: "pods"}): resource.MustParse("1"),
},
},
"init container maximums override sum of containers": {
pod: &api.Pod{
Spec: api.PodSpec{
@ -417,12 +435,14 @@ func TestPodEvaluatorUsage(t *testing.T) {
},
}
for testName, testCase := range testCases {
actual, err := evaluator.Usage(testCase.pod)
if err != nil {
t.Errorf("%s unexpected error: %v", testName, err)
}
if !quota.Equals(testCase.usage, actual) {
t.Errorf("%s expected: %v, actual: %v", testName, testCase.usage, actual)
}
t.Run(testName, func(t *testing.T) {
actual, err := evaluator.Usage(testCase.pod)
if err != nil {
t.Error(err)
}
if !quota.Equals(testCase.usage, actual) {
t.Errorf("expected: %v, actual: %v", testCase.usage, actual)
}
})
}
}