Skip to content

Commit 1422c09

Browse files
zak-pawelzak-pawel
authored
test(linters): Enable testifylint: blank-import, float-compare, negative-positive, nil-compare and useless-assert (#15566)
1 parent 1b849eb commit 1422c09

35 files changed

+136
-120
lines changed

‎.golangci.yml

+5
Original file line numberDiff line numberDiff line change
@@ -296,17 +296,22 @@ linters-settings:
296296
# len, negative-positive, nil-compare, require-error, suite-dont-use-pkg, suite-extra-assert-call, useless-assert
297297
# ).
298298
enable:
299+
- blank-import
299300
- bool-compare
300301
- compares
301302
- empty
302303
- error-is-as
303304
- error-nil
304305
- expected-actual
306+
- float-compare
305307
- len
308+
- negative-positive
309+
- nil-compare
306310
- require-error
307311
- suite-dont-use-pkg
308312
- suite-extra-assert-call
309313
- suite-thelper
314+
- useless-assert
310315

311316
run:
312317
# Timeout for analysis, e.g. 30s, 5m.

‎agent/accumulator_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212

1313
"github.com/influxdata/telegraf"
1414
"github.com/influxdata/telegraf/logger"
15+
"github.com/influxdata/telegraf/testutil"
1516
)
1617

1718
func TestAddFields(t *testing.T) {
@@ -32,7 +33,7 @@ func TestAddFields(t *testing.T) {
3233
actual, ok := testm.GetField("usage")
3334

3435
require.True(t, ok)
35-
require.Equal(t, float64(99), actual)
36+
require.InDelta(t, float64(99), actual, testutil.DefaultDelta)
3637

3738
actual, ok = testm.GetTag("foo")
3839
require.True(t, ok)

‎metric/metric_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestAddFieldOverwrites(t *testing.T) {
112112

113113
value, ok := m.GetField("value")
114114
require.True(t, ok)
115-
require.Equal(t, 42.0, value)
115+
require.InDelta(t, 42.0, value, 0.001)
116116
}
117117

118118
func TestAddFieldChangesType(t *testing.T) {

‎plugins/inputs/ceph/ceph_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ func TestParseOsdDump(t *testing.T) {
4242
dump, err := c.parseDump(osdPerfDump)
4343
require.NoError(t, err)
4444
require.InEpsilon(t, 552132.109360000, dump["filestore"]["commitcycle_interval.sum"], epsilon)
45-
require.Equal(t, float64(0), dump["mutex-FileJournal::finisher_lock"]["wait.avgcount"])
45+
require.InDelta(t, float64(0), dump["mutex-FileJournal::finisher_lock"]["wait.avgcount"], testutil.DefaultDelta)
4646
}
4747

4848
func TestParseMdsDump(t *testing.T) {
4949
c := &Ceph{Log: testutil.Logger{}}
5050
dump, err := c.parseDump(mdsPerfDump)
5151
require.NoError(t, err)
5252
require.InEpsilon(t, 2408386.600934982, dump["mds"]["reply_latency.sum"], epsilon)
53-
require.Equal(t, float64(0), dump["throttle-write_buf_throttle"]["wait.avgcount"])
53+
require.InDelta(t, float64(0), dump["throttle-write_buf_throttle"]["wait.avgcount"], testutil.DefaultDelta)
5454
}
5555

5656
func TestParseRgwDump(t *testing.T) {
5757
c := &Ceph{Log: testutil.Logger{}}
5858
dump, err := c.parseDump(rgwPerfDump)
5959
require.NoError(t, err)
6060
require.InEpsilon(t, 0.002219876, dump["rgw"]["get_initial_lat.sum"], epsilon)
61-
require.Equal(t, float64(0), dump["rgw"]["put_initial_lat.avgcount"])
61+
require.InDelta(t, float64(0), dump["rgw"]["put_initial_lat.avgcount"], testutil.DefaultDelta)
6262
}
6363

6464
func TestDecodeStatus(t *testing.T) {

‎plugins/inputs/cloud_pubsub/cloud_pubsub_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,6 @@ func TestRunErrorInSubscriber(t *testing.T) {
293293
func validateTestInfluxMetric(t *testing.T, m *testutil.Metric) {
294294
require.Equal(t, "cpu_load_short", m.Measurement)
295295
require.Equal(t, "server01", m.Tags["host"])
296-
require.Equal(t, 23422.0, m.Fields["value"])
296+
require.InDelta(t, 23422.0, m.Fields["value"], testutil.DefaultDelta)
297297
require.Equal(t, int64(1422568543702900257), m.Time.UnixNano())
298298
}

‎plugins/inputs/ctrlx_datalayer/ctrlx_datalayer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ func TestCtrlXMetricsField(t *testing.T) {
206206
require.NoError(t, acc.GatherError(s.Start))
207207
require.Eventually(t, func() bool {
208208
if v, found := acc.FloatField(measurement, fieldName); found {
209-
require.Equal(t, 43.0, v)
209+
require.InDelta(t, 43.0, v, testutil.DefaultDelta)
210210
return true
211211
}
212212
return false
@@ -226,7 +226,7 @@ func TestCtrlXMetricsMulti(t *testing.T) {
226226
require.NoError(t, acc.GatherError(s.Start))
227227
require.Eventually(t, func() bool {
228228
if v, found := acc.FloatField(measurement, fieldName); found {
229-
require.Equal(t, 44.0, v)
229+
require.InDelta(t, 44.0, v, testutil.DefaultDelta)
230230
return true
231231
}
232232
return false

‎plugins/inputs/fluentd/fluentd_test.go

+25-25
Original file line numberDiff line numberDiff line change
@@ -200,41 +200,41 @@ func Test_Gather(t *testing.T) {
200200
require.Equal(t, expectedOutput[0].PluginID, acc.Metrics[0].Tags["plugin_id"])
201201
require.Equal(t, expectedOutput[0].PluginType, acc.Metrics[0].Tags["plugin_type"])
202202
require.Equal(t, expectedOutput[0].PluginCategory, acc.Metrics[0].Tags["plugin_category"])
203-
require.Equal(t, *expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"])
203+
require.InDelta(t, *expectedOutput[0].RetryCount, acc.Metrics[0].Fields["retry_count"], testutil.DefaultDelta)
204204

205205
require.Equal(t, expectedOutput[1].PluginID, acc.Metrics[1].Tags["plugin_id"])
206206
require.Equal(t, expectedOutput[1].PluginType, acc.Metrics[1].Tags["plugin_type"])
207207
require.Equal(t, expectedOutput[1].PluginCategory, acc.Metrics[1].Tags["plugin_category"])
208-
require.Equal(t, *expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"])
209-
require.Equal(t, *expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"])
210-
require.Equal(t, *expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"])
208+
require.InDelta(t, *expectedOutput[1].RetryCount, acc.Metrics[1].Fields["retry_count"], testutil.DefaultDelta)
209+
require.InDelta(t, *expectedOutput[1].BufferQueueLength, acc.Metrics[1].Fields["buffer_queue_length"], testutil.DefaultDelta)
210+
require.InDelta(t, *expectedOutput[1].BufferTotalQueuedSize, acc.Metrics[1].Fields["buffer_total_queued_size"], testutil.DefaultDelta)
211211

212212
require.Equal(t, expectedOutput[2].PluginID, acc.Metrics[2].Tags["plugin_id"])
213213
require.Equal(t, expectedOutput[2].PluginType, acc.Metrics[2].Tags["plugin_type"])
214214
require.Equal(t, expectedOutput[2].PluginCategory, acc.Metrics[2].Tags["plugin_category"])
215-
require.Equal(t, *expectedOutput[2].RetryCount, acc.Metrics[2].Fields["retry_count"])
216-
require.Equal(t, *expectedOutput[2].BufferQueueLength, acc.Metrics[2].Fields["buffer_queue_length"])
217-
require.Equal(t, *expectedOutput[2].BufferTotalQueuedSize, acc.Metrics[2].Fields["buffer_total_queued_size"])
218-
require.Equal(t, *expectedOutput[2].EmitRecords, acc.Metrics[2].Fields["emit_records"])
219-
require.Equal(t, *expectedOutput[2].EmitSize, acc.Metrics[2].Fields["emit_size"])
220-
require.Equal(t, *expectedOutput[2].EmitCount, acc.Metrics[2].Fields["emit_count"])
221-
require.Equal(t, *expectedOutput[2].RollbackCount, acc.Metrics[2].Fields["rollback_count"])
222-
require.Equal(t, *expectedOutput[2].SlowFlushCount, acc.Metrics[2].Fields["slow_flush_count"])
223-
require.Equal(t, *expectedOutput[2].WriteCount, acc.Metrics[2].Fields["write_count"])
224-
require.Equal(t, *expectedOutput[2].FlushTimeCount, acc.Metrics[2].Fields["flush_time_count"])
225-
require.Equal(t, *expectedOutput[2].BufferStageLength, acc.Metrics[2].Fields["buffer_stage_length"])
226-
require.Equal(t, *expectedOutput[2].BufferStageByteSize, acc.Metrics[2].Fields["buffer_stage_byte_size"])
227-
require.Equal(t, *expectedOutput[2].BufferQueueByteSize, acc.Metrics[2].Fields["buffer_queue_byte_size"])
228-
require.Equal(t, *expectedOutput[2].AvailBufferSpaceRatios, acc.Metrics[2].Fields["buffer_available_buffer_space_ratios"])
215+
require.InDelta(t, *expectedOutput[2].RetryCount, acc.Metrics[2].Fields["retry_count"], testutil.DefaultDelta)
216+
require.InDelta(t, *expectedOutput[2].BufferQueueLength, acc.Metrics[2].Fields["buffer_queue_length"], testutil.DefaultDelta)
217+
require.InDelta(t, *expectedOutput[2].BufferTotalQueuedSize, acc.Metrics[2].Fields["buffer_total_queued_size"], testutil.DefaultDelta)
218+
require.InDelta(t, *expectedOutput[2].EmitRecords, acc.Metrics[2].Fields["emit_records"], testutil.DefaultDelta)
219+
require.InDelta(t, *expectedOutput[2].EmitSize, acc.Metrics[2].Fields["emit_size"], testutil.DefaultDelta)
220+
require.InDelta(t, *expectedOutput[2].EmitCount, acc.Metrics[2].Fields["emit_count"], testutil.DefaultDelta)
221+
require.InDelta(t, *expectedOutput[2].RollbackCount, acc.Metrics[2].Fields["rollback_count"], testutil.DefaultDelta)
222+
require.InDelta(t, *expectedOutput[2].SlowFlushCount, acc.Metrics[2].Fields["slow_flush_count"], testutil.DefaultDelta)
223+
require.InDelta(t, *expectedOutput[2].WriteCount, acc.Metrics[2].Fields["write_count"], testutil.DefaultDelta)
224+
require.InDelta(t, *expectedOutput[2].FlushTimeCount, acc.Metrics[2].Fields["flush_time_count"], testutil.DefaultDelta)
225+
require.InDelta(t, *expectedOutput[2].BufferStageLength, acc.Metrics[2].Fields["buffer_stage_length"], testutil.DefaultDelta)
226+
require.InDelta(t, *expectedOutput[2].BufferStageByteSize, acc.Metrics[2].Fields["buffer_stage_byte_size"], testutil.DefaultDelta)
227+
require.InDelta(t, *expectedOutput[2].BufferQueueByteSize, acc.Metrics[2].Fields["buffer_queue_byte_size"], testutil.DefaultDelta)
228+
require.InDelta(t, *expectedOutput[2].AvailBufferSpaceRatios, acc.Metrics[2].Fields["buffer_available_buffer_space_ratios"], testutil.DefaultDelta)
229229

230230
require.Equal(t, expectedOutput[3].PluginID, acc.Metrics[3].Tags["plugin_id"])
231231
require.Equal(t, expectedOutput[3].PluginType, acc.Metrics[3].Tags["plugin_type"])
232232
require.Equal(t, expectedOutput[3].PluginCategory, acc.Metrics[3].Tags["plugin_category"])
233-
require.Equal(t, *expectedOutput[3].RetryCount, acc.Metrics[3].Fields["retry_count"])
234-
require.Equal(t, *expectedOutput[3].BufferQueueLength, acc.Metrics[3].Fields["buffer_queue_length"])
235-
require.Equal(t, *expectedOutput[3].BufferTotalQueuedSize, acc.Metrics[3].Fields["buffer_total_queued_size"])
236-
require.Equal(t, *expectedOutput[3].EmitRecords, acc.Metrics[3].Fields["emit_records"])
237-
require.Equal(t, *expectedOutput[3].RollbackCount, acc.Metrics[3].Fields["rollback_count"])
238-
require.Equal(t, *expectedOutput[3].SlowFlushCount, acc.Metrics[3].Fields["slow_flush_count"])
239-
require.Equal(t, *expectedOutput[3].AvailBufferSpaceRatios, acc.Metrics[3].Fields["buffer_available_buffer_space_ratios"])
233+
require.InDelta(t, *expectedOutput[3].RetryCount, acc.Metrics[3].Fields["retry_count"], testutil.DefaultDelta)
234+
require.InDelta(t, *expectedOutput[3].BufferQueueLength, acc.Metrics[3].Fields["buffer_queue_length"], testutil.DefaultDelta)
235+
require.InDelta(t, *expectedOutput[3].BufferTotalQueuedSize, acc.Metrics[3].Fields["buffer_total_queued_size"], testutil.DefaultDelta)
236+
require.InDelta(t, *expectedOutput[3].EmitRecords, acc.Metrics[3].Fields["emit_records"], testutil.DefaultDelta)
237+
require.InDelta(t, *expectedOutput[3].RollbackCount, acc.Metrics[3].Fields["rollback_count"], testutil.DefaultDelta)
238+
require.InDelta(t, *expectedOutput[3].SlowFlushCount, acc.Metrics[3].Fields["slow_flush_count"], testutil.DefaultDelta)
239+
require.InDelta(t, *expectedOutput[3].AvailBufferSpaceRatios, acc.Metrics[3].Fields["buffer_available_buffer_space_ratios"], testutil.DefaultDelta)
240240
}

‎plugins/inputs/google_cloud_storage/google_cloud_storage_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ func TestRunGatherOneItem(t *testing.T) {
9292
require.Equal(t, "cpu", metric.Measurement)
9393
require.Equal(t, "us-east-1", metric.Tags["tags_datacenter"])
9494
require.Equal(t, "localhost", metric.Tags["tags_host"])
95-
require.Equal(t, 10.0, metric.Fields["fields_cosine"])
96-
require.Equal(t, -1.0975806427415925e-12, metric.Fields["fields_sine"])
95+
require.InDelta(t, 10.0, metric.Fields["fields_cosine"], testutil.DefaultDelta)
96+
require.InEpsilon(t, -1.0975806427415925e-12, metric.Fields["fields_sine"], testutil.DefaultEpsilon)
9797
}
9898

9999
func TestRunGatherOneIteration(t *testing.T) {

‎plugins/inputs/http/http_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package http_test
33
import (
44
"compress/gzip"
55
"fmt"
6-
"github.com/influxdata/telegraf/config"
76
"io"
87
"math/rand"
98
"net"
@@ -19,6 +18,7 @@ import (
1918
"github.com/stretchr/testify/require"
2019

2120
"github.com/influxdata/telegraf"
21+
"github.com/influxdata/telegraf/config"
2222
httpconfig "github.com/influxdata/telegraf/plugins/common/http"
2323
"github.com/influxdata/telegraf/plugins/common/oauth"
2424
httpplugin "github.com/influxdata/telegraf/plugins/inputs/http"
@@ -62,7 +62,7 @@ func TestHTTPWithJSONFormat(t *testing.T) {
6262
var metric = acc.Metrics[0]
6363
require.Equal(t, metric.Measurement, metricName)
6464
require.Len(t, acc.Metrics[0].Fields, 1)
65-
require.Equal(t, 1.2, acc.Metrics[0].Fields["a"])
65+
require.InDelta(t, 1.2, acc.Metrics[0].Fields["a"], testutil.DefaultDelta)
6666
require.Equal(t, acc.Metrics[0].Tags["url"], address)
6767
}
6868

‎plugins/inputs/http_response/http_response_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func checkFields(t *testing.T, fields map[string]interface{}, acc *testutil.Accu
4949
case float64:
5050
value, ok := acc.FloatField("http_response", key)
5151
require.True(t, ok)
52-
require.Equal(t, field, value)
52+
require.InDelta(t, field, value, testutil.DefaultDelta)
5353
case string:
5454
value, ok := acc.StringField("http_response", key)
5555
require.True(t, ok)

‎plugins/inputs/intel_dlb/intel_dlb_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ func TestDLB_gatherSecondDeviceIndex(t *testing.T) {
421421
mockConn.On("Close").Return(nil).Once()
422422

423423
_, err := dlb.gatherSecondDeviceIndex(0, dlb.EventdevCommands[0])
424-
require.Equal(t, nil, dlb.connection)
424+
require.Nil(t, dlb.connection)
425425
require.Error(t, err)
426426
require.Contains(t, err.Error(), "failed to parse json")
427427
dlb.SocketPath = pathToSocket

‎plugins/inputs/intel_powerstat/intel_powerstat_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4948,8 +4948,8 @@ func TestGetUncoreFreqInitialLimits(t *testing.T) {
49484948
initMin, initMax, err := getUncoreFreqInitialLimits(mFetcher, packageID, dieID)
49494949

49504950
require.NoError(t, err)
4951-
require.Equal(t, initMinExp, initMin)
4952-
require.Equal(t, initMaxExp, initMax)
4951+
require.InDelta(t, initMinExp, initMin, testutil.DefaultDelta)
4952+
require.InDelta(t, initMaxExp, initMax, testutil.DefaultDelta)
49534953
mFetcher.AssertExpectations(t)
49544954
})
49554955
}

‎plugins/inputs/intel_rdt/publisher_test.go

+12-12
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@ func TestParseCoresMeasurement(t *testing.T) {
4444
require.NoError(t, err)
4545
require.Equal(t, expectedCores, result.cores)
4646
require.Equal(t, expectedTimestamp, result.time)
47-
require.Equal(t, result.values[0], metricsValues["IPC"])
48-
require.Equal(t, result.values[1], metricsValues["LLC_Misses"])
49-
require.Equal(t, result.values[2], metricsValues["LLC"])
50-
require.Equal(t, result.values[3], metricsValues["MBL"])
51-
require.Equal(t, result.values[4], metricsValues["MBR"])
52-
require.Equal(t, result.values[5], metricsValues["MBT"])
47+
require.InDelta(t, result.values[0], metricsValues["IPC"], testutil.DefaultDelta)
48+
require.InDelta(t, result.values[1], metricsValues["LLC_Misses"], testutil.DefaultDelta)
49+
require.InDelta(t, result.values[2], metricsValues["LLC"], testutil.DefaultDelta)
50+
require.InDelta(t, result.values[3], metricsValues["MBL"], testutil.DefaultDelta)
51+
require.InDelta(t, result.values[4], metricsValues["MBR"], testutil.DefaultDelta)
52+
require.InDelta(t, result.values[5], metricsValues["MBT"], testutil.DefaultDelta)
5353
})
5454
t.Run("not valid measurement string", func(t *testing.T) {
5555
measurement := "not, valid, measurement"
@@ -131,12 +131,12 @@ func TestParseProcessesMeasurement(t *testing.T) {
131131
require.Equal(t, processName, result.process)
132132
require.Equal(t, expectedCores, result.cores)
133133
require.Equal(t, expectedTimestamp, result.time)
134-
require.Equal(t, result.values[0], metricsValues["IPC"])
135-
require.Equal(t, result.values[1], metricsValues["LLC_Misses"])
136-
require.Equal(t, result.values[2], metricsValues["LLC"])
137-
require.Equal(t, result.values[3], metricsValues["MBL"])
138-
require.Equal(t, result.values[4], metricsValues["MBR"])
139-
require.Equal(t, result.values[5], metricsValues["MBT"])
134+
require.InDelta(t, result.values[0], metricsValues["IPC"], testutil.DefaultDelta)
135+
require.InDelta(t, result.values[1], metricsValues["LLC_Misses"], testutil.DefaultDelta)
136+
require.InDelta(t, result.values[2], metricsValues["LLC"], testutil.DefaultDelta)
137+
require.InDelta(t, result.values[3], metricsValues["MBL"], testutil.DefaultDelta)
138+
require.InDelta(t, result.values[4], metricsValues["MBR"], testutil.DefaultDelta)
139+
require.InDelta(t, result.values[5], metricsValues["MBT"], testutil.DefaultDelta)
140140
})
141141

142142
invalidTimestamp := "2020-20-20-31"

‎plugins/inputs/mock/mock_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func TestGather(t *testing.T) {
7575
for k, v := range metric.Fields {
7676
switch k {
7777
case "abc":
78-
require.Equal(t, 50.0, v)
78+
require.InDelta(t, 50.0, v, testutil.DefaultDelta)
7979
case "constant_string":
8080
require.Equal(t, testConstantString.Value, v)
8181
case "constant_float":
@@ -88,9 +88,9 @@ func TestGather(t *testing.T) {
8888
require.GreaterOrEqual(t, 6.0, v)
8989
require.LessOrEqual(t, 1.0, v)
9090
case "sine":
91-
require.Equal(t, 2.0, v)
91+
require.InDelta(t, 2.0, v, testutil.DefaultDelta)
9292
case "step":
93-
require.Equal(t, 0.0, v)
93+
require.InDelta(t, 0.0, v, testutil.DefaultDelta)
9494
default:
9595
require.Failf(t, "unexpected field %q", k)
9696
}

‎plugins/inputs/netflow/type_conversion_test.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import (
55
"testing"
66

77
"github.com/stretchr/testify/require"
8+
9+
"github.com/influxdata/telegraf/testutil"
810
)
911

1012
func TestDecodeInt32(t *testing.T) {
@@ -66,7 +68,7 @@ func TestDecodeFloat64(t *testing.T) {
6668
require.NoError(t, err)
6769
out, ok := v.(float64)
6870
require.True(t, ok)
69-
require.Equal(t, float64(3.14159265359), out)
71+
require.InDelta(t, float64(3.14159265359), out, testutil.DefaultDelta)
7072
}
7173

7274
func TestDecodeBool(t *testing.T) {

‎plugins/inputs/pgbouncer/pgbouncer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestPgBouncerGeneratesMetricsIntegration(t *testing.T) {
9898
metricsCounted++
9999
}
100100

101-
require.Greater(t, metricsCounted, 0)
101+
require.Positive(t, metricsCounted)
102102
require.Equal(t, len(intMetricsPgBouncer)+len(intMetricsPgBouncerPools), metricsCounted)
103103
}
104104

@@ -210,6 +210,6 @@ func TestPgBouncerGeneratesMetricsIntegrationShowCommands(t *testing.T) {
210210
metricsCounted++
211211
}
212212

213-
require.Greater(t, metricsCounted, 0)
213+
require.Positive(t, metricsCounted)
214214
require.Equal(t, len(intMetricsPgBouncerPools)+len(intMetricsPgBouncerLists)+len(intMetricsPgBouncerDatabases), metricsCounted)
215215
}

0 commit comments

Comments
 (0)