From 5646120fbbe5fe07e64a1a1a5680af8564b3d682 Mon Sep 17 00:00:00 2001 From: CatherineF-dev Date: Tue, 16 Nov 2021 18:57:24 +0000 Subject: [PATCH] Use Reset at first --- pkg/kubelet/kuberuntime/instrumented_services_test.go | 4 +++- .../k8s.io/component-base/metrics/testutil/metrics_test.go | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kuberuntime/instrumented_services_test.go b/pkg/kubelet/kuberuntime/instrumented_services_test.go index e95d6bdb74a..7919c552890 100644 --- a/pkg/kubelet/kuberuntime/instrumented_services_test.go +++ b/pkg/kubelet/kuberuntime/instrumented_services_test.go @@ -33,11 +33,13 @@ func TestRecordOperation(t *testing.T) { // Use local registry var registry = compbasemetrics.NewKubeRegistry() var gather compbasemetrics.Gatherer = registry - defer registry.Reset() + registry.MustRegister(metrics.RuntimeOperations) registry.MustRegister(metrics.RuntimeOperationsDuration) registry.MustRegister(metrics.RuntimeOperationsErrors) + registry.Reset() + l, err := net.Listen("tcp", "127.0.0.1:0") assert.NoError(t, err) defer l.Close() diff --git a/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go b/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go index 4f916c155b5..c289b6a4902 100644 --- a/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go +++ b/staging/src/k8s.io/component-base/metrics/testutil/metrics_test.go @@ -587,8 +587,6 @@ func TestGetHistogramVecFromGatherer(t *testing.T) { if diff := cmp.Diff(tt.wantVec, histogramVec); diff != "" { t.Errorf("Got unexpected HistogramVec (-want +got):\n%s", diff) } - - registry.Reset() }) } }