Skip to content

Commit aebc8ea

Browse files
authored
Merge pull request kubernetes#83713 from RainbowMango/pr_refactor_kubelet_collector_test
Refactor kubelet collector test
2 parents f06b3b8 + 633bb52 commit aebc8ea

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

pkg/kubelet/metrics/collectors/BUILD

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ go_test(
3030
"//pkg/kubelet/server/stats/testing:go_default_library",
3131
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
3232
"//staging/src/k8s.io/component-base/metrics/testutil:go_default_library",
33-
"//vendor/github.com/prometheus/client_golang/prometheus:go_default_library",
3433
],
3534
)
3635

pkg/kubelet/metrics/collectors/log_metrics_test.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,19 @@ import (
2020
"strings"
2121
"testing"
2222

23-
"github.com/prometheus/client_golang/prometheus"
24-
2523
"k8s.io/component-base/metrics/testutil"
2624
statsapi "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1"
2725
)
2826

2927
func TestNoMetricsCollected(t *testing.T) {
30-
ch := make(chan prometheus.Metric)
31-
3228
collector := &logMetricsCollector{
3329
podStats: func() ([]statsapi.PodStats, error) {
3430
return []statsapi.PodStats{}, nil
3531
},
3632
}
37-
collector.Collect(ch)
3833

39-
num := len(ch)
40-
if num != 0 {
41-
t.Fatalf("Channel expected to be empty, but received %d", num)
34+
if err := testutil.CollectAndCompare(collector, strings.NewReader(""), ""); err != nil {
35+
t.Fatal(err)
4236
}
4337
}
4438

0 commit comments

Comments
 (0)