Skip to content

Commit 6580c6a

Browse files
trashhalotrashhalo
authored
prefer testify error funcs over nil checks (influxdata#7857)
1 parent bf5befa commit 6580c6a

File tree

12 files changed

+70
-70
lines changed

12 files changed

+70
-70
lines changed

‎internal/internal_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,11 @@ func TestCompressWithGzipEarlyClose(t *testing.T) {
269269

270270
func TestVersionAlreadySet(t *testing.T) {
271271
err := SetVersion("foo")
272-
assert.Nil(t, err)
272+
assert.NoError(t, err)
273273

274274
err = SetVersion("bar")
275275

276-
assert.NotNil(t, err)
276+
assert.Error(t, err)
277277
assert.IsType(t, VersionAlreadySetError, err)
278278

279279
assert.Equal(t, "foo", Version())

‎plugins/inputs/bind/bind_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestBindJsonStats(t *testing.T) {
2525
var acc testutil.Accumulator
2626
err := acc.GatherError(b.Gather)
2727

28-
assert.Nil(t, err)
28+
assert.NoError(t, err)
2929

3030
// Use subtests for counters, since they are similar structure
3131
type fieldSet struct {
@@ -195,7 +195,7 @@ func TestBindXmlStatsV2(t *testing.T) {
195195
var acc testutil.Accumulator
196196
err := acc.GatherError(b.Gather)
197197

198-
assert.Nil(t, err)
198+
assert.NoError(t, err)
199199

200200
// Use subtests for counters, since they are similar structure
201201
type fieldSet struct {
@@ -397,7 +397,7 @@ func TestBindXmlStatsV3(t *testing.T) {
397397
var acc testutil.Accumulator
398398
err := acc.GatherError(b.Gather)
399399

400-
assert.Nil(t, err)
400+
assert.NoError(t, err)
401401

402402
// Use subtests for counters, since they are similar structure
403403
type fieldSet struct {

‎plugins/inputs/cassandra/cassandra_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func TestHttpJsonJavaMultiValue(t *testing.T) {
153153
acc.SetDebug(true)
154154
err := acc.GatherError(cassandra.Gather)
155155

156-
assert.Nil(t, err)
156+
assert.NoError(t, err)
157157
assert.Equal(t, 2, len(acc.Metrics))
158158

159159
fields := map[string]interface{}{
@@ -182,7 +182,7 @@ func TestHttpJsonJavaMultiType(t *testing.T) {
182182
acc.SetDebug(true)
183183
err := acc.GatherError(cassandra.Gather)
184184

185-
assert.Nil(t, err)
185+
assert.NoError(t, err)
186186
assert.Equal(t, 2, len(acc.Metrics))
187187

188188
fields := map[string]interface{}{
@@ -217,7 +217,7 @@ func TestHttpJsonCassandraMultiValue(t *testing.T) {
217217
var acc testutil.Accumulator
218218
err := acc.GatherError(cassandra.Gather)
219219

220-
assert.Nil(t, err)
220+
assert.NoError(t, err)
221221
assert.Equal(t, 1, len(acc.Metrics))
222222

223223
fields := map[string]interface{}{
@@ -249,7 +249,7 @@ func TestHttpJsonCassandraNestedMultiValue(t *testing.T) {
249249
acc.SetDebug(true)
250250
err := acc.GatherError(cassandra.Gather)
251251

252-
assert.Nil(t, err)
252+
assert.NoError(t, err)
253253
assert.Equal(t, 2, len(acc.Metrics))
254254

255255
fields1 := map[string]interface{}{

‎plugins/inputs/cloudwatch/cloudwatch_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ func TestSelectMetrics(t *testing.T) {
218218
// We've asked for 2 (out of 4) metrics, over all 3 load balancers in all 2
219219
// AZs. We should get 12 metrics.
220220
assert.Equal(t, 12, len(filtered[0].metrics))
221-
assert.Nil(t, err)
221+
assert.NoError(t, err)
222222
}
223223

224224
func TestGenerateStatisticsInputParams(t *testing.T) {

‎plugins/inputs/filecount/filesystem_helpers_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func TestMTime(t *testing.T) {
1313

1414
fs := getTestFileSystem()
1515
fileInfo, err := fs.Stat("/testdata/foo")
16-
require.Nil(t, err)
16+
require.NoError(t, err)
1717
require.Equal(t, mtime, fileInfo.ModTime())
1818
}
1919

@@ -22,7 +22,7 @@ func TestSize(t *testing.T) {
2222
size := int64(4096)
2323
fs := getTestFileSystem()
2424
fileInfo, err := fs.Stat("/testdata")
25-
require.Nil(t, err)
25+
require.NoError(t, err)
2626
require.Equal(t, size, fileInfo.Size())
2727
}
2828

@@ -31,7 +31,7 @@ func TestIsDir(t *testing.T) {
3131
dir := true
3232
fs := getTestFileSystem()
3333
fileInfo, err := fs.Stat("/testdata")
34-
require.Nil(t, err)
34+
require.NoError(t, err)
3535
require.Equal(t, dir, fileInfo.IsDir())
3636
}
3737

@@ -40,7 +40,7 @@ func TestRealFS(t *testing.T) {
4040
var fs fileSystem = osFS{}
4141
//the following file exists on disk - and not in our fake fs
4242
fileInfo, err := fs.Stat(getTestdataDir() + "/qux")
43-
require.Nil(t, err)
43+
require.NoError(t, err)
4444
require.Equal(t, false, fileInfo.IsDir())
4545
require.Equal(t, int64(446), fileInfo.Size())
4646

@@ -52,7 +52,7 @@ func TestRealFS(t *testing.T) {
5252
require.Equal(t, expectedError, err.Error())
5353
// and verify that what we DO expect to find, we do
5454
fileInfo, err = fs.Stat("/testdata/foo")
55-
require.Nil(t, err)
55+
require.NoError(t, err)
5656
}
5757

5858
func getTestFileSystem() fakeFileSystem {

‎plugins/inputs/github/github_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ func TestNewGithubClient(t *testing.T) {
1313
httpClient := &http.Client{}
1414
g := &GitHub{}
1515
client, err := g.newGithubClient(httpClient)
16-
require.Nil(t, err)
16+
require.NoError(t, err)
1717
require.Contains(t, client.BaseURL.String(), "api.github.com")
1818
g.EnterpriseBaseURL = "api.example.com/"
1919
enterpriseClient, err := g.newGithubClient(httpClient)
20-
require.Nil(t, err)
20+
require.NoError(t, err)
2121
require.Contains(t, enterpriseClient.BaseURL.String(), "api.example.com")
2222
}
2323

@@ -51,7 +51,7 @@ func TestSplitRepositoryNameWithNoSlash(t *testing.T) {
5151
t.Run(tt, func(t *testing.T) {
5252
_, _, err := splitRepositoryName(tt)
5353

54-
require.NotNil(t, err)
54+
require.Error(t, err)
5555
})
5656
}
5757
}

‎plugins/inputs/gnmi/gnmi_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ func TestParsePath(t *testing.T) {
2323
path := "/foo/bar/bla[shoo=woo][shoop=/woop/]/z"
2424
parsed, err := parsePath("theorigin", path, "thetarget")
2525

26-
assert.Nil(t, err)
26+
assert.NoError(t, err)
2727
assert.Equal(t, parsed.Origin, "theorigin")
2828
assert.Equal(t, parsed.Target, "thetarget")
2929
assert.Equal(t, parsed.Element, []string{"foo", "bar", "bla[shoo=woo][shoop=/woop/]", "z"})
3030
assert.Equal(t, parsed.Elem, []*gnmi.PathElem{{Name: "foo"}, {Name: "bar"},
3131
{Name: "bla", Key: map[string]string{"shoo": "woo", "shoop": "/woop/"}}, {Name: "z"}})
3232

3333
parsed, err = parsePath("", "", "")
34-
assert.Nil(t, err)
34+
assert.NoError(t, err)
3535
assert.Equal(t, *parsed, gnmi.Path{})
3636

3737
parsed, err = parsePath("", "/foo[[", "")

‎plugins/inputs/jolokia/jolokia_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func TestHttpJsonMultiValue(t *testing.T) {
160160
var acc testutil.Accumulator
161161
err := acc.GatherError(jolokia.Gather)
162162

163-
assert.Nil(t, err)
163+
assert.NoError(t, err)
164164
assert.Equal(t, 1, len(acc.Metrics))
165165

166166
fields := map[string]interface{}{
@@ -184,7 +184,7 @@ func TestHttpJsonBulkResponse(t *testing.T) {
184184
var acc testutil.Accumulator
185185
err := jolokia.Gather(&acc)
186186

187-
assert.Nil(t, err)
187+
assert.NoError(t, err)
188188
assert.Equal(t, 1, len(acc.Metrics))
189189

190190
fields := map[string]interface{}{
@@ -212,7 +212,7 @@ func TestHttpJsonThreeLevelMultiValue(t *testing.T) {
212212
var acc testutil.Accumulator
213213
err := acc.GatherError(jolokia.Gather)
214214

215-
assert.Nil(t, err)
215+
assert.NoError(t, err)
216216
assert.Equal(t, 1, len(acc.Metrics))
217217

218218
fields := map[string]interface{}{

‎plugins/inputs/statsd/datadog_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ func TestEventGather(t *testing.T) {
8181
t.Run(tests[i].name, func(t *testing.T) {
8282
err := s.parseEventMessage(tests[i].now, tests[i].message, tests[i].hostname)
8383
if tests[i].err {
84-
require.NotNil(t, err)
84+
require.Error(t, err)
8585
} else {
86-
require.Nil(t, err)
86+
require.NoError(t, err)
8787
}
8888
require.Equal(t, uint64(i+1), acc.NMetrics())
8989

90-
require.Nil(t, err)
90+
require.NoError(t, err)
9191
require.Equal(t, tests[i].expected.title, acc.Metrics[i].Measurement)
9292
require.Equal(t, tests[i].expected.tags, acc.Metrics[i].Tags)
9393
require.Equal(t, tests[i].expected.fields, acc.Metrics[i].Fields)
@@ -388,7 +388,7 @@ func TestEvents(t *testing.T) {
388388
t.Run(tests[i].name, func(t *testing.T) {
389389
acc.ClearMetrics()
390390
err := s.parseEventMessage(tests[i].args.now, tests[i].args.message, tests[i].args.hostname)
391-
require.Nil(t, err)
391+
require.NoError(t, err)
392392
m := acc.Metrics[0]
393393
require.Equal(t, tests[i].expected.title, m.Measurement)
394394
require.Equal(t, tests[i].expected.text, m.Fields["text"])

‎plugins/inputs/syslog/rfc5426_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func testRFC5426(t *testing.T, protocol string, address string, bestEffort bool)
238238
// Connect
239239
conn, err := net.Dial(protocol, address)
240240
require.NotNil(t, conn)
241-
require.Nil(t, err)
241+
require.NoError(t, err)
242242

243243
// Write
244244
_, err = conn.Write(tc.data)
@@ -326,7 +326,7 @@ func TestTimeIncrement_udp(t *testing.T) {
326326
conn, err := net.Dial("udp", address)
327327
require.NotNil(t, conn)
328328
defer conn.Close()
329-
require.Nil(t, err)
329+
require.NoError(t, err)
330330

331331
// Write
332332
_, e := conn.Write([]byte("<1>1 - - - - - -"))

0 commit comments

Comments
 (0)