diff --git a/staging/src/k8s.io/component-base/metrics/counter_test.go b/staging/src/k8s.io/component-base/metrics/counter_test.go index a27a271a64b..d7196f48c9f 100644 --- a/staging/src/k8s.io/component-base/metrics/counter_test.go +++ b/staging/src/k8s.io/component-base/metrics/counter_test.go @@ -23,6 +23,7 @@ import ( "github.com/blang/semver/v4" "github.com/prometheus/common/expfmt" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apimachineryversion "k8s.io/apimachinery/pkg/version" ) @@ -88,10 +89,10 @@ func TestCounter(t *testing.T) { var buf bytes.Buffer enc := expfmt.NewEncoder(&buf, "text/plain; version=0.0.4; charset=utf-8") assert.Lenf(t, mfs, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(mfs), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range mfs { err := enc.Encode(metric) - assert.Nil(t, err, "Unexpected err %v in encoding the metric", err) + require.NoError(t, err, "Unexpected err %v in encoding the metric", err) assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp) } @@ -101,7 +102,7 @@ func TestCounter(t *testing.T) { c.Inc() } mfs, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range mfs { mfMetric := mf.GetMetric() @@ -187,7 +188,7 @@ func TestCounterVec(t *testing.T) { c.WithLabelValues("1", "2").Inc() mfs, err := registry.Gather() assert.Lenf(t, mfs, test.expectedMetricFamilyCount, "Got %v metric families, Want: %v metric families", len(mfs), test.expectedMetricFamilyCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) // this no-opts here when there are no metric families (i.e. when the metric is hidden) for _, mf := range mfs { @@ -199,7 +200,7 @@ func TestCounterVec(t *testing.T) { c.WithLabelValues("1", "3").Inc() c.WithLabelValues("2", "3").Inc() mfs, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) // this no-opts here when there are no metric families (i.e. when the metric is hidden) for _, mf := range mfs { @@ -257,7 +258,7 @@ func TestCounterWithLabelValueAllowList(t *testing.T) { c.WithLabelValues(lv...).Inc() } mfs, err := registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range mfs { if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) { diff --git a/staging/src/k8s.io/component-base/metrics/gauge_test.go b/staging/src/k8s.io/component-base/metrics/gauge_test.go index 59c6d5509fd..c6c09dfed1a 100644 --- a/staging/src/k8s.io/component-base/metrics/gauge_test.go +++ b/staging/src/k8s.io/component-base/metrics/gauge_test.go @@ -23,6 +23,7 @@ import ( "github.com/blang/semver/v4" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apimachineryversion "k8s.io/apimachinery/pkg/version" ) @@ -88,7 +89,7 @@ func TestGauge(t *testing.T) { ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { 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) { c.Set(101) expected := 101 ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { for _, m := range mf.GetMetric() { @@ -176,7 +177,7 @@ func TestGaugeVec(t *testing.T) { c.WithLabelValues("1", "2").Set(1.0) ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { assert.Equalf(t, test.expectedHelp, metric.GetHelp(), "Got %s as help message, want %s", metric.GetHelp(), test.expectedHelp) } @@ -185,7 +186,7 @@ func TestGaugeVec(t *testing.T) { c.WithLabelValues("1", "3").Set(1.0) c.WithLabelValues("2", "3").Set(1.0) ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { 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) { g.WithLabelValues(lv...).Set(100.0) } mfs, err := registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range mfs { if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) { @@ -339,7 +340,7 @@ func TestGaugeWithLabelValueAllowList(t *testing.T) { expectedValue, ok := test.expectMetricValues[labelValuePair] assert.True(t, ok, "Got unexpected label values, lable_a is %v, label_b is %v", aValue, bValue) actualValue := m.GetGauge().GetValue() - 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) + 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) } } }) diff --git a/staging/src/k8s.io/component-base/metrics/histogram_test.go b/staging/src/k8s.io/component-base/metrics/histogram_test.go index 1bf7e6b1550..51c5601f312 100644 --- a/staging/src/k8s.io/component-base/metrics/histogram_test.go +++ b/staging/src/k8s.io/component-base/metrics/histogram_test.go @@ -22,6 +22,7 @@ import ( "github.com/blang/semver/v4" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apimachineryversion "k8s.io/apimachinery/pkg/version" ) @@ -103,7 +104,7 @@ func TestHistogram(t *testing.T) { ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { 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) { c.Observe(1.5) expected := 4 ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { for _, m := range mf.GetMetric() { @@ -212,7 +213,7 @@ func TestHistogramVec(t *testing.T) { ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { if metric.GetHelp() != test.expectedHelp { 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) { c.WithLabelValues("1", "3").Observe(1.0) c.WithLabelValues("2", "3").Observe(1.0) ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { 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) { c.WithLabelValues(lv...).Observe(1.0) } mfs, err := registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range mfs { if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) { diff --git a/staging/src/k8s.io/component-base/metrics/registry_test.go b/staging/src/k8s.io/component-base/metrics/registry_test.go index a5e7ffa4552..ff607dd8a6e 100644 --- a/staging/src/k8s.io/component-base/metrics/registry_test.go +++ b/staging/src/k8s.io/component-base/metrics/registry_test.go @@ -25,6 +25,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apimachineryversion "k8s.io/apimachinery/pkg/version" ) @@ -234,7 +235,7 @@ func TestShowHiddenMetric(t *testing.T) { registry.MustRegister(alphaHiddenCounter) ms, err := registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) assert.Lenf(t, ms, expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount) showHidden.Store(true) @@ -252,7 +253,7 @@ func TestShowHiddenMetric(t *testing.T) { expectedMetricCount = 1 ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) assert.Lenf(t, ms, expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), expectedMetricCount) } diff --git a/staging/src/k8s.io/component-base/metrics/summary_test.go b/staging/src/k8s.io/component-base/metrics/summary_test.go index c470579bb1e..ca9b50b7981 100644 --- a/staging/src/k8s.io/component-base/metrics/summary_test.go +++ b/staging/src/k8s.io/component-base/metrics/summary_test.go @@ -21,6 +21,7 @@ import ( "github.com/blang/semver/v4" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apimachineryversion "k8s.io/apimachinery/pkg/version" ) @@ -88,7 +89,7 @@ func TestSummary(t *testing.T) { ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { 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) { c.Observe(1.5) expected := 4 ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { for _, m := range mf.GetMetric() { @@ -177,7 +178,7 @@ func TestSummaryVec(t *testing.T) { c.WithLabelValues("1", "2").Observe(1.0) ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { 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) { c.WithLabelValues("1", "3").Observe(1.0) c.WithLabelValues("2", "3").Observe(1.0) ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { 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) { c.WithLabelValues(lv...).Observe(1.0) } mfs, err := registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range mfs { if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) { diff --git a/staging/src/k8s.io/component-base/metrics/timing_histogram_test.go b/staging/src/k8s.io/component-base/metrics/timing_histogram_test.go index ab21303d62a..de10a87bd79 100644 --- a/staging/src/k8s.io/component-base/metrics/timing_histogram_test.go +++ b/staging/src/k8s.io/component-base/metrics/timing_histogram_test.go @@ -23,6 +23,7 @@ import ( "github.com/blang/semver/v4" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" apimachineryversion "k8s.io/apimachinery/pkg/version" testclock "k8s.io/utils/clock/testing" @@ -112,7 +113,7 @@ func TestTimingHistogram(t *testing.T) { ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { 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) { expectedCount := uint64(dt1 + dt2 + dt3) expectedSum := float64(dt1)*v0 + float64(dt2)*v1 + float64(dt3)*v2 ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { t.Logf("Considering metric family %s", mf.GetName()) for _, m := range mf.GetMetric() { assert.Equalf(t, expectedCount, m.GetHistogram().GetSampleCount(), "Got %v, want %v as the sample count of metric %s", m.GetHistogram().GetSampleCount(), expectedCount, m.String()) - assert.Equalf(t, expectedSum, m.GetHistogram().GetSampleSum(), "Got %v, want %v as the sample sum of metric %s", m.GetHistogram().GetSampleSum(), expectedSum, m.String()) + 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()) } } }) @@ -243,7 +244,7 @@ func TestTimingHistogramVec(t *testing.T) { ms, err := registry.Gather() assert.Lenf(t, ms, test.expectedMetricCount, "Got %v metrics, Want: %v metrics", len(ms), test.expectedMetricCount) - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, metric := range ms { if metric.GetHelp() != test.expectedHelp { 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) { c.WithLabelValues("1", "3").Add(5.0) c.WithLabelValues("2", "3").Add(5.0) ms, err = registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range ms { t.Logf("Considering metric family %s", mf.String()) @@ -269,7 +270,7 @@ func TestTimingHistogramVec(t *testing.T) { expectedCount := uint64(dt1) expectedSum := float64(dt1) * v0 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()) - 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()) + 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()) } } }) @@ -335,7 +336,7 @@ func TestTimingHistogramWithLabelValueAllowList(t *testing.T) { c.WithLabelValues(lv...).Add(1.0) } mfs, err := registry.Gather() - assert.Nil(t, err, "Gather failed %v", err) + require.NoError(t, err, "Gather failed %v", err) for _, mf := range mfs { if *mf.Name != BuildFQName(opts.Namespace, opts.Subsystem, opts.Name) { @@ -362,7 +363,7 @@ func TestTimingHistogramWithLabelValueAllowList(t *testing.T) { actualCount := m.GetHistogram().GetSampleCount() actualSum := m.GetHistogram().GetSampleSum() 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) - 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) + 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) } } })