github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82105 from logicalhan/admission-test

Browse Source 
Explicitly handle returned error values in admission metrics_test
This commit is contained in:
Kubernetes Prow Robot 2019-10-01 11:03:50 -07:00 committed by GitHub
commit 5219ad7be2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go
View File

@ -37,8 +37,12 @@ var (
func TestObserveAdmissionStep(t *testing.T) { func TestObserveAdmissionStep(t *testing.T) {
Metrics.reset() Metrics.reset()
handler := WithStepMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}) handler := WithStepMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true})
handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil) if err := handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil); err != nil {
handler.(admission.ValidationInterface).Validate(context.TODO(), attr, nil) t.Errorf("Unexpected error in admit: %v", err)
}
if err := handler.(admission.ValidationInterface).Validate(context.TODO(), attr, nil); err != nil {
t.Errorf("Unexpected error in validate: %v", err)
}
wantLabels := map[string]string{ wantLabels := map[string]string{
"operation": string(admission.Create), "operation": string(admission.Create),
"type": "admit", "type": "admit",
@ -55,8 +59,12 @@ func TestObserveAdmissionStep(t *testing.T) {
func TestObserveAdmissionController(t *testing.T) { func TestObserveAdmissionController(t *testing.T) {
Metrics.reset() Metrics.reset()
handler := WithControllerMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}, "a") handler := WithControllerMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}, "a")
handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil) if err := handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil); err != nil {
handler.(admission.ValidationInterface).Validate(context.TODO(), attr, nil) t.Errorf("Unexpected error in admit: %v", err)
}
if err := handler.(admission.ValidationInterface).Validate(context.TODO(), attr, nil); err != nil {
t.Errorf("Unexpected error in validate: %v", err)
}
wantLabels := map[string]string{ wantLabels := map[string]string{
"name": "a", "name": "a",
"operation": string(admission.Create), "operation": string(admission.Create),