From 774641ebdbdc7fe89380e7e1e77f5ebbe843ecec Mon Sep 17 00:00:00 2001 From: Han Kang Date: Wed, 21 Aug 2019 12:13:33 -0700 Subject: [PATCH] Explicitly handle returned error values in admission metrics_test --- .../pkg/admission/metrics/metrics_test.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go index 1b96d25a217..df31991d6db 100644 --- a/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go +++ b/staging/src/k8s.io/apiserver/pkg/admission/metrics/metrics_test.go @@ -37,8 +37,12 @@ var ( func TestObserveAdmissionStep(t *testing.T) { Metrics.reset() handler := WithStepMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}) - handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil) - handler.(admission.ValidationInterface).Validate(context.TODO(), attr, nil) + if err := handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil); err != 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{ "operation": string(admission.Create), "type": "admit", @@ -55,8 +59,12 @@ func TestObserveAdmissionStep(t *testing.T) { func TestObserveAdmissionController(t *testing.T) { Metrics.reset() handler := WithControllerMetrics(&mutatingAndValidatingFakeHandler{admission.NewHandler(admission.Create), true, true}, "a") - handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil) - handler.(admission.ValidationInterface).Validate(context.TODO(), attr, nil) + if err := handler.(admission.MutationInterface).Admit(context.TODO(), attr, nil); err != 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{ "name": "a", "operation": string(admission.Create),