Skip to content

Commit 0300e40

Browse files
foxcppfoxcpp
committed
Linter clean-up
1 parent 1dfec2c commit 0300e40

File tree

5 files changed

+152
-51
lines changed

5 files changed

+152
-51
lines changed

‎internal/endpoint/openmetrics/om.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (e *Endpoint) Start() error {
8686
l, err := netresource.Listen(endp.Network(), endp.Address())
8787
if err != nil {
8888
if err := e.Stop(); err != nil {
89-
89+
e.logger.Error("failed to stop after failed listen", err)
9090
}
9191
return fmt.Errorf("%s: %v", modName, err)
9292
}

‎internal/endpoint/smtp/smtp_test.go‎

Lines changed: 71 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ func TestSMTPDelivery(t *testing.T) {
155155
if err != nil {
156156
t.Fatal(err)
157157
}
158-
defer cl.Close()
158+
defer func() {
159+
assert.NoError(t, cl.Close())
160+
}()
159161

160162
err = submitMsg(t, cl, "sender@example.org", []string{"rcpt1@example.com", "rcpt2@example.com"}, testMsg)
161163
if err != nil {
@@ -187,7 +189,9 @@ func TestSMTPDelivery(t *testing.T) {
187189
func TestSMTPDelivery_rDNSError(t *testing.T) {
188190
tgt := testutils.Target{}
189191
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
190-
defer endp.Stop()
192+
defer func() {
193+
assert.NoError(t, endp.Stop())
194+
}()
191195

192196
endp.resolver.(*mockdns.Resolver).Zones["1.0.0.127.in-addr.arpa."] = mockdns.Zone{
193197
Err: &net.DNSError{
@@ -202,7 +206,9 @@ func TestSMTPDelivery_rDNSError(t *testing.T) {
202206
if err != nil {
203207
t.Fatal(err)
204208
}
205-
defer cl.Close()
209+
defer func() {
210+
assert.NoError(t, cl.Close())
211+
}()
206212

207213
err = submitMsg(t, cl, "sender@example.org", []string{"rcpt1@example.com", "rcpt2@example.com"}, testMsg)
208214
if err != nil {
@@ -231,13 +237,17 @@ func TestSMTPDelivery_EarlyCheck_Fail(t *testing.T) {
231237
},
232238
},
233239
}, nil)
234-
defer endp.Stop()
240+
defer func() {
241+
assert.NoError(t, endp.Stop())
242+
}()
235243

236244
cl, err := smtp.Dial("127.0.0.1:" + testPort)
237245
if err != nil {
238246
t.Fatal(err)
239247
}
240-
defer cl.Close()
248+
defer func() {
249+
assert.NoError(t, cl.Close())
250+
}()
241251

242252
err = cl.Mail("sender@example.org", nil)
243253
if err == nil {
@@ -271,13 +281,17 @@ func TestSMTPDeliver_CheckError(t *testing.T) {
271281
},
272282
}, nil)
273283
endp.deferServerReject = false
274-
defer endp.Stop()
284+
defer func() {
285+
assert.NoError(t, endp.Stop())
286+
}()
275287

276288
cl, err := smtp.Dial("127.0.0.1:" + testPort)
277289
if err != nil {
278290
t.Fatal(err)
279291
}
280-
defer cl.Close()
292+
defer func() {
293+
assert.NoError(t, cl.Close())
294+
}()
281295

282296
err = cl.Mail("sender@example.org", nil)
283297
if err == nil {
@@ -310,13 +324,17 @@ func TestSMTPDeliver_CheckError_Deferred(t *testing.T) {
310324
},
311325
}, nil)
312326
endp.deferServerReject = true
313-
defer endp.Stop()
327+
defer func() {
328+
assert.NoError(t, endp.Stop())
329+
}()
314330

315331
cl, err := smtp.Dial("127.0.0.1:" + testPort)
316332
if err != nil {
317333
t.Fatal(err)
318334
}
319-
defer cl.Close()
335+
defer func() {
336+
assert.NoError(t, cl.Close())
337+
}()
320338

321339
err = cl.Mail("sender@example.org", nil)
322340
if err != nil {
@@ -349,13 +367,17 @@ func TestSMTPDeliver_CheckError_Deferred(t *testing.T) {
349367
func TestSMTPDelivery_Multi(t *testing.T) {
350368
tgt := testutils.Target{}
351369
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
352-
defer endp.Stop()
370+
defer func() {
371+
assert.NoError(t, endp.Stop())
372+
}()
353373

354374
cl, err := smtp.Dial("127.0.0.1:" + testPort)
355375
if err != nil {
356376
t.Fatal(err)
357377
}
358-
defer cl.Close()
378+
defer func() {
379+
assert.NoError(t, cl.Close())
380+
}()
359381

360382
err = submitMsg(t, cl, "sender1@example.org", []string{"rcpt1@example.com", "rcpt2@example.com"}, testMsg)
361383
if err != nil {
@@ -387,13 +409,17 @@ func TestSMTPDelivery_Multi(t *testing.T) {
387409
func TestSMTPDelivery_AbortData(t *testing.T) {
388410
tgt := testutils.Target{}
389411
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
390-
defer endp.Stop()
412+
defer func() {
413+
assert.NoError(t, endp.Stop())
414+
}()
391415

392416
cl, err := smtp.Dial("127.0.0.1:" + testPort)
393417
if err != nil {
394418
t.Fatal(err)
395419
}
396-
defer cl.Close()
420+
defer func() {
421+
_ = cl.Close()
422+
}()
397423

398424
if err := cl.Hello("mx.example.org"); err != nil {
399425
t.Fatal(err)
@@ -413,7 +439,7 @@ func TestSMTPDelivery_AbortData(t *testing.T) {
413439
}
414440

415441
// Then.. Suddenly, close the connection without sending the final dot.
416-
cl.Close()
442+
assert.NoError(t, cl.Close())
417443

418444
time.Sleep(250 * time.Millisecond)
419445

@@ -425,13 +451,17 @@ func TestSMTPDelivery_AbortData(t *testing.T) {
425451
func TestSMTPDelivery_EmptyMessage(t *testing.T) {
426452
tgt := testutils.Target{}
427453
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
428-
defer endp.Stop()
454+
defer func() {
455+
assert.NoError(t, endp.Stop())
456+
}()
429457

430458
cl, err := smtp.Dial("127.0.0.1:" + testPort)
431459
if err != nil {
432460
t.Fatal(err)
433461
}
434-
defer cl.Close()
462+
defer func() {
463+
assert.NoError(t, cl.Close())
464+
}()
435465

436466
if err := cl.Hello("mx.example.org"); err != nil {
437467
t.Fatal(err)
@@ -464,13 +494,17 @@ func TestSMTPDelivery_EmptyMessage(t *testing.T) {
464494
func TestSMTPDelivery_AbortLogout(t *testing.T) {
465495
tgt := testutils.Target{}
466496
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
467-
defer endp.Stop()
497+
defer func() {
498+
assert.NoError(t, endp.Stop())
499+
}()
468500

469501
cl, err := smtp.Dial("127.0.0.1:" + testPort)
470502
if err != nil {
471503
t.Fatal(err)
472504
}
473-
defer cl.Close()
505+
defer func() {
506+
_ = cl.Close()
507+
}()
474508

475509
if err := cl.Hello("mx.example.org"); err != nil {
476510
t.Fatal(err)
@@ -483,7 +517,7 @@ func TestSMTPDelivery_AbortLogout(t *testing.T) {
483517
}
484518

485519
// Then.. Suddenly, close the connection.
486-
cl.Close()
520+
assert.NoError(t, cl.Close())
487521

488522
time.Sleep(250 * time.Millisecond)
489523

@@ -495,13 +529,17 @@ func TestSMTPDelivery_AbortLogout(t *testing.T) {
495529
func TestSMTPDelivery_Reset(t *testing.T) {
496530
tgt := testutils.Target{}
497531
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
498-
defer endp.Stop()
532+
defer func() {
533+
assert.NoError(t, endp.Stop())
534+
}()
499535

500536
cl, err := smtp.Dial("127.0.0.1:" + testPort)
501537
if err != nil {
502538
t.Fatal(err)
503539
}
504-
defer cl.Close()
540+
defer func() {
541+
assert.NoError(t, cl.Close())
542+
}()
505543

506544
if err := cl.Mail("from-garbage@example.org", nil); err != nil {
507545
t.Fatal(err)
@@ -530,13 +568,17 @@ func TestSMTPDelivery_Reset(t *testing.T) {
530568
func TestSMTPDelivery_SubmissionAuthRequire(t *testing.T) {
531569
tgt := testutils.Target{}
532570
endp := testEndpoint(t, "submission", &module.Dummy{}, &tgt, nil, nil)
533-
defer endp.Stop()
571+
defer func() {
572+
assert.NoError(t, endp.Stop())
573+
}()
534574

535575
cl, err := smtp.Dial("127.0.0.1:" + testPort)
536576
if err != nil {
537577
t.Fatal(err)
538578
}
539-
defer cl.Close()
579+
defer func() {
580+
assert.NoError(t, cl.Close())
581+
}()
540582

541583
if err := cl.Mail("from-garbage@example.org", nil); err == nil {
542584
t.Fatal("Expected an error, got none")
@@ -546,13 +588,17 @@ func TestSMTPDelivery_SubmissionAuthRequire(t *testing.T) {
546588
func TestSMTPDelivery_SubmissionAuthOK(t *testing.T) {
547589
tgt := testutils.Target{}
548590
endp := testEndpoint(t, "submission", &module.Dummy{}, &tgt, nil, nil)
549-
defer endp.Stop()
591+
defer func() {
592+
assert.NoError(t, endp.Stop())
593+
}()
550594

551595
cl, err := smtp.Dial("127.0.0.1:" + testPort)
552596
if err != nil {
553597
t.Fatal(err)
554598
}
555-
defer cl.Close()
599+
defer func() {
600+
assert.NoError(t, cl.Close())
601+
}()
556602

557603
if err := cl.Auth(sasl.NewPlainClient("", "user", "password")); err != nil {
558604
t.Fatal(err)

‎internal/table/file_test.go‎

Lines changed: 56 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,18 @@ func TestReadFile(t *testing.T) {
3737
if err != nil {
3838
t.Fatal(err)
3939
}
40-
defer os.Remove(f.Name())
41-
defer f.Close()
40+
defer func(name string) {
41+
err := os.Remove(name)
42+
if err != nil {
43+
t.Log(err)
44+
}
45+
}(f.Name())
46+
defer func(f *os.File) {
47+
err := f.Close()
48+
if err != nil {
49+
t.Log(err)
50+
}
51+
}(f)
4252
if _, err := f.WriteString(file); err != nil {
4353
t.Fatal(err)
4454
}
@@ -92,12 +102,20 @@ func TestFileReload(t *testing.T) {
92102
if err != nil {
93103
t.Fatal(err)
94104
}
95-
defer os.Remove(f.Name())
105+
defer func(name string) {
106+
err := os.Remove(name)
107+
if err != nil {
108+
t.Log(err)
109+
}
110+
}(f.Name())
96111
if _, err := f.WriteString(file); err != nil {
97-
f.Close()
112+
_ = f.Close()
113+
t.Fatal(err)
114+
}
115+
err = f.Close()
116+
if err != nil {
98117
t.Fatal(err)
99118
}
100-
f.Close()
101119

102120
mod, err := NewFile("", "")
103121
if err != nil {
@@ -148,7 +166,12 @@ func TestFileReload_Broken(t *testing.T) {
148166
if err != nil {
149167
t.Fatal(err)
150168
}
151-
defer os.Remove(f.Name())
169+
defer func(name string) {
170+
err := os.Remove(name)
171+
if err != nil {
172+
t.Fatal(err)
173+
}
174+
}(f.Name())
152175
if _, err := f.WriteString(file); err != nil {
153176
assert.NoError(t, f.Close())
154177
t.Fatal(err)
@@ -164,7 +187,12 @@ func TestFileReload_Broken(t *testing.T) {
164187
t.Fatal(err)
165188
}
166189
m.log = testutils.Logger(t, FileModName)
167-
defer m.Stop()
190+
defer func(m *File) {
191+
err := m.Stop()
192+
if err != nil {
193+
t.Fatal(err)
194+
}
195+
}(m)
168196

169197
if err := mod.Configure([]string{f.Name()}, &config.Map{Block: config.Node{}}); err != nil {
170198
t.Fatal(err)
@@ -177,7 +205,12 @@ func TestFileReload_Broken(t *testing.T) {
177205
if _, err := f2.WriteString(":"); err != nil {
178206
t.Fatal(err)
179207
}
180-
defer f2.Close()
208+
defer func(f2 *os.File) {
209+
err := f2.Close()
210+
if err != nil {
211+
t.Fatal(err)
212+
}
213+
}(f2)
181214

182215
time.Sleep(3 * reloadInterval)
183216

@@ -198,10 +231,13 @@ func TestFileReload_Removed(t *testing.T) {
198231
t.Fatal(err)
199232
}
200233
if _, err := f.WriteString(file); err != nil {
201-
f.Close()
234+
_ = f.Close()
235+
t.Fatal(err)
236+
}
237+
err = f.Close()
238+
if err != nil {
202239
t.Fatal(err)
203240
}
204-
f.Close()
205241

206242
mod, err := NewFile("", "")
207243
if err != nil {
@@ -212,13 +248,21 @@ func TestFileReload_Removed(t *testing.T) {
212248
t.Fatal(err)
213249
}
214250
m.log = testutils.Logger(t, FileModName)
215-
defer m.Stop()
251+
defer func(m *File) {
252+
err := m.Stop()
253+
if err != nil {
254+
t.Fatal(err)
255+
}
256+
}(m)
216257

217258
if err := mod.Configure([]string{f.Name()}, &config.Map{Block: config.Node{}}); err != nil {
218259
t.Fatal(err)
219260
}
220261

221-
os.Remove(f.Name())
262+
err = os.Remove(f.Name())
263+
if err != nil {
264+
t.Fatal(err)
265+
}
222266

223267
time.Sleep(3 * reloadInterval)
224268

0 commit comments

Comments
 (0)