Skip to content

Commit 31cc449

Browse files
mmorel-35mmorel-35
committed
fix: enable testifylint on staging/src/k8s.io/component-base 
1 parent 00d03ec commit 31cc449

File tree

6 files changed

+38
-32
lines changed

6 files changed

+38
-32
lines changed

‎staging/src/k8s.io/component-base/metrics/counter_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/blang/semver/v4"
2424
"github.com/prometheus/common/expfmt"
2525
"github.com/stretchr/testify/assert"
26+
"github.com/stretchr/testify/require"
2627

2728
apimachineryversion "k8s.io/apimachinery/pkg/version"
2829
)
@@ -88,10 +89,10 @@ func TestCounter(t *testing.T) {
8889
var buf bytes.Buffer
8990
enc := expfmt.NewEncoder(&buf, "text/plain; version=0.0.4; charset=utf-8")
9091
assert.Lenf(t, mfs, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(mfs), test.expectedMetricCount)
91-
assert.Nil(t, err, "Gather failed %v", err)
92+
require.NoError(t, err, "Gather failed %v", err)
9293
for _, metric := range mfs {
9394
err := enc.Encode(metric)
94-
assert.Nil(t, err, "Unexpected err %v in encoding the metric", err)
95+
require.NoError(t, err, "Unexpected err %v in encoding the metric", err)
9596
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
9697
}
9798

@@ -101,7 +102,7 @@ func TestCounter(t *testing.T) {
101102
c.Inc()
102103
}
103104
mfs, err = registry.Gather()
104-
assert.Nil(t, err, "Gather failed %v", err)
105+
require.NoError(t, err, "Gather failed %v", err)
105106

106107
for _, mf := range mfs {
107108
mfMetric := mf.GetMetric()
@@ -187,7 +188,7 @@ func TestCounterVec(t *testing.T) {
187188
c.WithLabelValues("1", "2").Inc()
188189
mfs, err := registry.Gather()
189190
assert.Lenf(t, mfs, test.expectedMetricFamilyCount, "Got %v metric families, Want: %v metric families", len(mfs), test.expectedMetricFamilyCount)
190-
assert.Nil(t, err, "Gather failed %v", err)
191+
require.NoError(t, err, "Gather failed %v", err)
191192

192193
// this no-opts here when there are no metric families (i.e. when the metric is hidden)
193194
for _, mf := range mfs {
@@ -199,7 +200,7 @@ func TestCounterVec(t *testing.T) {
199200
c.WithLabelValues("1", "3").Inc()
200201
c.WithLabelValues("2", "3").Inc()
201202
mfs, err = registry.Gather()
202-
assert.Nil(t, err, "Gather failed %v", err)
203+
require.NoError(t, err, "Gather failed %v", err)
203204

204205
// this no-opts here when there are no metric families (i.e. when the metric is hidden)
205206
for _, mf := range mfs {
@@ -257,7 +258,7 @@ func TestCounterWithLabelValueAllowList(t *testing.T) {
257258
c.WithLabelValues(lv...).Inc()
258259
}
259260
mfs, err := registry.Gather()
260-
assert.Nil(t, err, "Gather failed %v", err)
261+
require.NoError(t, err, "Gather failed %v", err)
261262

262263
for _, mf := range mfs {
263264
if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) {

‎staging/src/k8s.io/component-base/metrics/gauge_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/blang/semver/v4"
2424
"github.com/prometheus/client_golang/prometheus/testutil"
2525
"github.com/stretchr/testify/assert"
26+
"github.com/stretchr/testify/require"
2627

2728
apimachineryversion "k8s.io/apimachinery/pkg/version"
2829
)
@@ -88,7 +89,7 @@ func TestGauge(t *testing.T) {
8889

8990
ms, err := registry.Gather()
9091
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
91-
assert.Nil(t, err, "Gather failed %v", err)
92+
require.NoError(t, err, "Gather failed %v", err)
9293

9394
for _, metric := range ms {
9495
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -99,7 +100,7 @@ func TestGauge(t *testing.T) {
99100
c.Set(101)
100101
expected := 101
101102
ms, err = registry.Gather()
102-
assert.Nil(t, err, "Gather failed %v", err)
103+
require.NoError(t, err, "Gather failed %v", err)
103104

104105
for _, mf := range ms {
105106
for _, m := range mf.GetMetric() {
@@ -176,7 +177,7 @@ func TestGaugeVec(t *testing.T) {
176177
c.WithLabelValues("1", "2").Set(1.0)
177178
ms, err := registry.Gather()
178179
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
179-
assert.Nil(t, err, "Gather failed %v", err)
180+
require.NoError(t, err, "Gather failed %v", err)
180181
for _, metric := range ms {
181182
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
182183
}
@@ -185,7 +186,7 @@ func TestGaugeVec(t *testing.T) {
185186
c.WithLabelValues("1", "3").Set(1.0)
186187
c.WithLabelValues("2", "3").Set(1.0)
187188
ms, err = registry.Gather()
188-
assert.Nil(t, err, "Gather failed %v", err)
189+
require.NoError(t, err, "Gather failed %v", err)
189190

190191
for _, mf := range ms {
191192
assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
@@ -317,7 +318,7 @@ func TestGaugeWithLabelValueAllowList(t *testing.T) {
317318
g.WithLabelValues(lv...).Set(100.0)
318319
}
319320
mfs, err := registry.Gather()
320-
assert.Nil(t, err, "Gather failed %v", err)
321+
require.NoError(t, err, "Gather failed %v", err)
321322

322323
for _, mf := range mfs {
323324
if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) {
@@ -339,7 +340,7 @@ func TestGaugeWithLabelValueAllowList(t *testing.T) {
339340
expectedValue, ok := test.expectMetricValues[labelValuePair]
340341
assert.True(t, ok, "Got unexpected label values, lable_a is %v, label_b is %v", aValue, bValue)
341342
actualValue := m.GetGauge().GetValue()
342-
assert.Equalf(t, expectedValue, actualValue, "Got %v, wanted %v as the gauge while setting label_a to %v and label b to %v", actualValue, expectedValue, aValue, bValue)
343+
assert.InDeltaf(t, expectedValue, actualValue, 0.01, "Got %v, wanted %v as the gauge while setting label_a to %v and label b to %v", actualValue, expectedValue, aValue, bValue)
343344
}
344345
}
345346
})

‎staging/src/k8s.io/component-base/metrics/histogram_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/blang/semver/v4"
2323
"github.com/prometheus/client_golang/prometheus"
2424
"github.com/stretchr/testify/assert"
25+
"github.com/stretchr/testify/require"
2526

2627
apimachineryversion "k8s.io/apimachinery/pkg/version"
2728
)
@@ -103,7 +104,7 @@ func TestHistogram(t *testing.T) {
103104

104105
ms, err := registry.Gather()
105106
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
106-
assert.Nil(t, err, "Gather failed %v", err)
107+
require.NoError(t, err, "Gather failed %v", err)
107108

108109
for _, metric := range ms {
109110
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -116,7 +117,7 @@ func TestHistogram(t *testing.T) {
116117
c.Observe(1.5)
117118
expected := 4
118119
ms, err = registry.Gather()
119-
assert.Nil(t, err, "Gather failed %v", err)
120+
require.NoError(t, err, "Gather failed %v", err)
120121

121122
for _, mf := range ms {
122123
for _, m := range mf.GetMetric() {
@@ -212,7 +213,7 @@ func TestHistogramVec(t *testing.T) {
212213

213214
ms, err := registry.Gather()
214215
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
215-
assert.Nil(t, err, "Gather failed %v", err)
216+
require.NoError(t, err, "Gather failed %v", err)
216217
for _, metric := range ms {
217218
if metric.GetHelp() != test.expectedHelp {
218219
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -223,7 +224,7 @@ func TestHistogramVec(t *testing.T) {
223224
c.WithLabelValues("1", "3").Observe(1.0)
224225
c.WithLabelValues("2", "3").Observe(1.0)
225226
ms, err = registry.Gather()
226-
assert.Nil(t, err, "Gather failed %v", err)
227+
require.NoError(t, err, "Gather failed %v", err)
227228

228229
for _, mf := range ms {
229230
assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 3 as the count", len(mf.GetMetric()))
@@ -283,7 +284,7 @@ func TestHistogramWithLabelValueAllowList(t *testing.T) {
283284
c.WithLabelValues(lv...).Observe(1.0)
284285
}
285286
mfs, err := registry.Gather()
286-
assert.Nil(t, err, "Gather failed %v", err)
287+
require.NoError(t, err, "Gather failed %v", err)
287288

288289
for _, mf := range mfs {
289290
if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) {

‎staging/src/k8s.io/component-base/metrics/registry_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"github.com/prometheus/client_golang/prometheus"
2626
"github.com/prometheus/client_golang/prometheus/testutil"
2727
"github.com/stretchr/testify/assert"
28+
"github.com/stretchr/testify/require"
2829

2930
apimachineryversion "k8s.io/apimachinery/pkg/version"
3031
)
@@ -234,7 +235,7 @@ func TestShowHiddenMetric(t *testing.T) {
234235
registry.MustRegister(alphaHiddenCounter)
235236

236237
ms, err := registry.Gather()
237-
assert.Nil(t, err, "Gather failed %v", err)
238+
require.NoError(t, err, "Gather failed %v", err)
238239
assert.Lenf(t, ms, expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
239240

240241
showHidden.Store(true)
@@ -252,7 +253,7 @@ func TestShowHiddenMetric(t *testing.T) {
252253
expectedMetricCount = 1
253254

254255
ms, err = registry.Gather()
255-
assert.Nil(t, err, "Gather failed %v", err)
256+
require.NoError(t, err, "Gather failed %v", err)
256257
assert.Lenf(t, ms, expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount)
257258
}
258259

‎staging/src/k8s.io/component-base/metrics/summary_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121

2222
"github.com/blang/semver/v4"
2323
"github.com/stretchr/testify/assert"
24+
"github.com/stretchr/testify/require"
2425

2526
apimachineryversion "k8s.io/apimachinery/pkg/version"
2627
)
@@ -88,7 +89,7 @@ func TestSummary(t *testing.T) {
8889

8990
ms, err := registry.Gather()
9091
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
91-
assert.Nil(t, err, "Gather failed %v", err)
92+
require.NoError(t, err, "Gather failed %v", err)
9293

9394
for _, metric := range ms {
9495
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -101,7 +102,7 @@ func TestSummary(t *testing.T) {
101102
c.Observe(1.5)
102103
expected := 4
103104
ms, err = registry.Gather()
104-
assert.Nil(t, err, "Gather failed %v", err)
105+
require.NoError(t, err, "Gather failed %v", err)
105106

106107
for _, mf := range ms {
107108
for _, m := range mf.GetMetric() {
@@ -177,7 +178,7 @@ func TestSummaryVec(t *testing.T) {
177178
c.WithLabelValues("1", "2").Observe(1.0)
178179
ms, err := registry.Gather()
179180
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
180-
assert.Nil(t, err, "Gather failed %v", err)
181+
require.NoError(t, err, "Gather failed %v", err)
181182

182183
for _, metric := range ms {
183184
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -187,7 +188,7 @@ func TestSummaryVec(t *testing.T) {
187188
c.WithLabelValues("1", "3").Observe(1.0)
188189
c.WithLabelValues("2", "3").Observe(1.0)
189190
ms, err = registry.Gather()
190-
assert.Nil(t, err, "Gather failed %v", err)
191+
require.NoError(t, err, "Gather failed %v", err)
191192

192193
for _, mf := range ms {
193194
assert.Lenf(t, mf.GetMetric(), 3, "Got %v metrics, wanted 2 as the count", len(mf.GetMetric()))
@@ -247,7 +248,7 @@ func TestSummaryWithLabelValueAllowList(t *testing.T) {
247248
c.WithLabelValues(lv...).Observe(1.0)
248249
}
249250
mfs, err := registry.Gather()
250-
assert.Nil(t, err, "Gather failed %v", err)
251+
require.NoError(t, err, "Gather failed %v", err)
251252

252253
for _, mf := range mfs {
253254
if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) {

‎staging/src/k8s.io/component-base/metrics/timing_histogram_test.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/blang/semver/v4"
2424
"github.com/prometheus/client_golang/prometheus"
2525
"github.com/stretchr/testify/assert"
26+
"github.com/stretchr/testify/require"
2627

2728
apimachineryversion "k8s.io/apimachinery/pkg/version"
2829
testclock "k8s.io/utils/clock/testing"
@@ -112,7 +113,7 @@ func TestTimingHistogram(t *testing.T) {
112113

113114
ms, err := registry.Gather()
114115
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
115-
assert.Nil(t, err, "Gather failed %v", err)
116+
require.NoError(t, err, "Gather failed %v", err)
116117

117118
for _, metric := range ms {
118119
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -137,13 +138,13 @@ func TestTimingHistogram(t *testing.T) {
137138
expectedCount := uint64(dt1 + dt2 + dt3)
138139
expectedSum := float64(dt1)*v0 + float64(dt2)*v1 + float64(dt3)*v2
139140
ms, err = registry.Gather()
140-
assert.Nil(t, err, "Gather failed %v", err)
141+
require.NoError(t, err, "Gather failed %v", err)
141142

142143
for _, mf := range ms {
143144
t.Logf("Considering metric family %s", mf.GetName())
144145
for _, m := range mf.GetMetric() {
145146
assert.Equalf(t, expectedCount, m.GetHistogram().GetSampleCount(), "Got %v, want %v as the sample count of metric %s", m.GetHistogram().GetSampleCount(), expectedCount, m.String())
146-
assert.Equalf(t, expectedSum, m.GetHistogram().GetSampleSum(), "Got %v, want %v as the sample sum of metric %s", m.GetHistogram().GetSampleSum(), expectedSum, m.String())
147+
assert.InDeltaf(t, expectedSum, m.GetHistogram().GetSampleSum(), 0.01, "Got %v, want %v as the sample sum of metric %s", m.GetHistogram().GetSampleSum(), expectedSum, m.String())
147148
}
148149
}
149150
})
@@ -243,7 +244,7 @@ func TestTimingHistogramVec(t *testing.T) {
243244

244245
ms, err := registry.Gather()
245246
assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount)
246-
assert.Nil(t, err, "Gather failed %v", err)
247+
require.NoError(t, err, "Gather failed %v", err)
247248
for _, metric := range ms {
248249
if metric.GetHelp() != test.expectedHelp {
249250
assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp)
@@ -260,7 +261,7 @@ func TestTimingHistogramVec(t *testing.T) {
260261
c.WithLabelValues("1", "3").Add(5.0)
261262
c.WithLabelValues("2", "3").Add(5.0)
262263
ms, err = registry.Gather()
263-
assert.Nil(t, err, "Gather failed %v", err)
264+
require.NoError(t, err, "Gather failed %v", err)
264265

265266
for _, mf := range ms {
266267
t.Logf("Considering metric family %s", mf.String())
@@ -269,7 +270,7 @@ func TestTimingHistogramVec(t *testing.T) {
269270
expectedCount := uint64(dt1)
270271
expectedSum := float64(dt1) * v0
271272
assert.Equalf(t, expectedCount, m.GetHistogram().GetSampleCount(), "Got %v, expected histogram sample count to equal %d for metric %s", m.GetHistogram().GetSampleCount(), expectedCount, m.String())
272-
assert.Equalf(t, expectedSum, m.GetHistogram().GetSampleSum(), "Got %v, expected histogram sample sum to equal %v for metric %s", m.GetHistogram().GetSampleSum(), expectedSum, m.String())
273+
assert.InDeltaf(t, expectedSum, m.GetHistogram().GetSampleSum(), 0.01, "Got %v, expected histogram sample sum to equal %v for metric %s", m.GetHistogram().GetSampleSum(), expectedSum, m.String())
273274
}
274275
}
275276
})
@@ -335,7 +336,7 @@ func TestTimingHistogramWithLabelValueAllowList(t *testing.T) {
335336
c.WithLabelValues(lv...).Add(1.0)
336337
}
337338
mfs, err := registry.Gather()
338-
assert.Nil(t, err, "Gather failed %v", err)
339+
require.NoError(t, err, "Gather failed %v", err)
339340

340341
for _, mf := range mfs {
341342
if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) {
@@ -362,7 +363,7 @@ func TestTimingHistogramWithLabelValueAllowList(t *testing.T) {
362363
actualCount := m.GetHistogram().GetSampleCount()
363364
actualSum := m.GetHistogram().GetSampleSum()
364365
assert.Equalf(t, expectedCount, actualCount, "Got %v, wanted %v as the count while setting label_a to %v and label b to %v", actualCount, expectedCount, aValue, bValue)
365-
assert.Equalf(t, expectedSum, actualSum, "Got %v, wanted %v as the sum while setting label_a to %v and label b to %v", actualSum, expectedSum, aValue, bValue)
366+
assert.InDeltaf(t, expectedSum, actualSum, 0.01, "Got %v, wanted %v as the sum while setting label_a to %v and label b to %v", actualSum, expectedSum, aValue, bValue)
366367
}
367368
}
368369
})

0 commit comments

Comments
 (0)