Skip to content

Commit 7922d24

Browse files
foxcppfoxcpp
committed
Linter clean-up 2
1 parent 0300e40 commit 7922d24

File tree

6 files changed

+169
-58
lines changed

6 files changed

+169
-58
lines changed

‎framework/dns/override.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var overrideServ string
3232
//
3333
// The server argument is in form of "IP:PORT". It is expected that the server
3434
// will be available both using TCP and UDP on the same port.
35-
func override(server string) {
35+
func override(server string) { // nolint: unused // used in debugflags.go
3636
net.DefaultResolver.PreferGo = true
3737
net.DefaultResolver.Dial = func(ctx context.Context, network, _ string) (net.Conn, error) {
3838
dialer := net.Dialer{

‎internal/endpoint/smtp/smtputf8_test.go‎

Lines changed: 58 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"github.com/foxcpp/maddy/framework/exterrors"
2828
"github.com/foxcpp/maddy/framework/module"
2929
"github.com/foxcpp/maddy/internal/testutils"
30+
"github.com/stretchr/testify/assert"
3031
)
3132

3233
func TestSMTPUTF8_MangleStatusMessage(t *testing.T) {
@@ -43,14 +44,18 @@ func TestSMTPUTF8_MangleStatusMessage(t *testing.T) {
4344
},
4445
}, nil)
4546
endp.deferServerReject = false
46-
defer endp.Stop()
47+
defer func() {
48+
assert.NoError(t, endp.Stop())
49+
}()
4750
defer testutils.WaitForConnsClose(t, endp.serv)
4851

4952
cl, err := smtp.Dial("127.0.0.1:" + testPort)
5053
if err != nil {
5154
t.Fatal(err)
5255
}
53-
defer cl.Close()
56+
defer func() {
57+
assert.NoError(t, cl.Close())
58+
}()
5459

5560
err = cl.Mail("sender@example.org", nil)
5661
if err == nil {
@@ -73,7 +78,9 @@ func TestSMTP_RejectNonASCIIFrom(t *testing.T) {
7378
tgt := testutils.Target{}
7479
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
7580
endp.deferServerReject = false
76-
defer endp.Stop()
81+
defer func() {
82+
assert.NoError(t, endp.Stop())
83+
}()
7784
defer testutils.WaitForConnsClose(t, endp.serv)
7885

7986
cl, err := smtp.Dial("127.0.0.1:" + testPort)
@@ -100,14 +107,18 @@ func TestSMTPUTF8_NormalizeCaseFoldFrom(t *testing.T) {
100107
tgt := testutils.Target{}
101108
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
102109
endp.deferServerReject = false
103-
defer endp.Stop()
110+
defer func() {
111+
assert.NoError(t, endp.Stop())
112+
}()
104113
defer testutils.WaitForConnsClose(t, endp.serv)
105114

106115
cl, err := smtp.Dial("127.0.0.1:" + testPort)
107116
if err != nil {
108117
t.Fatal(err)
109118
}
110-
defer cl.Close()
119+
defer func() {
120+
assert.NoError(t, cl.Close())
121+
}()
111122

112123
err = submitMsgOpts(t, cl, "foo@E\u0301.example.org", []string{"rcpt@example.com"}, &smtp.MailOptions{
113124
UTF8: true,
@@ -127,14 +138,18 @@ func TestSMTP_RejectNonASCIIRcpt(t *testing.T) {
127138
tgt := testutils.Target{}
128139
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
129140
endp.deferServerReject = false
130-
defer endp.Stop()
141+
defer func() {
142+
assert.NoError(t, endp.Stop())
143+
}()
131144
defer testutils.WaitForConnsClose(t, endp.serv)
132145

133146
cl, err := smtp.Dial("127.0.0.1:" + testPort)
134147
if err != nil {
135148
t.Fatal(err)
136149
}
137-
defer cl.Close()
150+
defer func() {
151+
assert.NoError(t, cl.Close())
152+
}()
138153

139154
err = submitMsg(t, cl, "x@example.org", []string{"ѣ@example.org"}, testMsg)
140155

@@ -154,14 +169,18 @@ func TestSMTPUTF8_NormalizeCaseFoldRcpt(t *testing.T) {
154169
tgt := testutils.Target{}
155170
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
156171
endp.deferServerReject = false
157-
defer endp.Stop()
172+
defer func() {
173+
assert.NoError(t, endp.Stop())
174+
}()
158175
defer testutils.WaitForConnsClose(t, endp.serv)
159176

160177
cl, err := smtp.Dial("127.0.0.1:" + testPort)
161178
if err != nil {
162179
t.Fatal(err)
163180
}
164-
defer cl.Close()
181+
defer func() {
182+
assert.NoError(t, cl.Close())
183+
}()
165184

166185
err = submitMsgOpts(t, cl, "x@example.org", []string{"foo@E\u0301.example.org"}, &smtp.MailOptions{
167186
UTF8: true,
@@ -191,14 +210,18 @@ func TestSMTPUTF8_NoMangleStatusMessage(t *testing.T) {
191210
},
192211
}, nil)
193212
endp.deferServerReject = false
194-
defer endp.Stop()
213+
defer func() {
214+
assert.NoError(t, endp.Stop())
215+
}()
195216
defer testutils.WaitForConnsClose(t, endp.serv)
196217

197218
cl, err := smtp.Dial("127.0.0.1:" + testPort)
198219
if err != nil {
199220
t.Fatal(err)
200221
}
201-
defer cl.Close()
222+
defer func() {
223+
assert.NoError(t, cl.Close())
224+
}()
202225

203226
err = cl.Mail("sender@example.org", &smtp.MailOptions{
204227
UTF8: true,
@@ -222,14 +245,18 @@ func TestSMTPUTF8_NoMangleStatusMessage(t *testing.T) {
222245
func TestSMTPUTF8_Received_EHLO_ALabel(t *testing.T) {
223246
tgt := testutils.Target{}
224247
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
225-
defer endp.Stop()
248+
defer func() {
249+
assert.NoError(t, endp.Stop())
250+
}()
226251
defer testutils.WaitForConnsClose(t, endp.serv)
227252

228253
cl, err := smtp.Dial("127.0.0.1:" + testPort)
229254
if err != nil {
230255
t.Fatal(err)
231256
}
232-
defer cl.Close()
257+
defer func() {
258+
assert.NoError(t, cl.Close())
259+
}()
233260

234261
if err := cl.Hello("凱凱.invalid"); err != nil {
235262
t.Fatal(err)
@@ -256,7 +283,9 @@ func TestSMTPUTF8_Received_EHLO_ALabel(t *testing.T) {
256283
func TestSMTPUTF8_Received_rDNS_ALabel(t *testing.T) {
257284
tgt := testutils.Target{}
258285
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
259-
defer endp.Stop()
286+
defer func() {
287+
assert.NoError(t, endp.Stop())
288+
}()
260289
defer testutils.WaitForConnsClose(t, endp.serv)
261290

262291
endp.resolver.(*mockdns.Resolver).Zones["1.0.0.127.in-addr.arpa."] = mockdns.Zone{
@@ -267,7 +296,9 @@ func TestSMTPUTF8_Received_rDNS_ALabel(t *testing.T) {
267296
if err != nil {
268297
t.Fatal(err)
269298
}
270-
defer cl.Close()
299+
defer func() {
300+
assert.NoError(t, cl.Close())
301+
}()
271302

272303
err = submitMsg(t, cl, "sender@example.org", []string{"rcpt1@example.com", "rcpt2@example.com"}, testMsg)
273304
if err != nil {
@@ -290,7 +321,9 @@ func TestSMTPUTF8_Received_rDNS_ALabel(t *testing.T) {
290321
func TestSMTPUTF8_Received_rDNS_ULabel(t *testing.T) {
291322
tgt := testutils.Target{}
292323
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
293-
defer endp.Stop()
324+
defer func() {
325+
assert.NoError(t, endp.Stop())
326+
}()
294327
defer testutils.WaitForConnsClose(t, endp.serv)
295328

296329
endp.resolver.(*mockdns.Resolver).Zones["1.0.0.127.in-addr.arpa."] = mockdns.Zone{
@@ -301,7 +334,9 @@ func TestSMTPUTF8_Received_rDNS_ULabel(t *testing.T) {
301334
if err != nil {
302335
t.Fatal(err)
303336
}
304-
defer cl.Close()
337+
defer func() {
338+
assert.NoError(t, cl.Close())
339+
}()
305340

306341
err = submitMsgOpts(t, cl, "sender@example.org", []string{"rcpt1@example.com", "rcpt2@example.com"}, &smtp.MailOptions{
307342
UTF8: true,
@@ -326,14 +361,18 @@ func TestSMTPUTF8_Received_rDNS_ULabel(t *testing.T) {
326361
func TestSMTPUTF8_Received_EHLO_ULabel(t *testing.T) {
327362
tgt := testutils.Target{}
328363
endp := testEndpoint(t, "smtp", nil, &tgt, nil, nil)
329-
defer endp.Stop()
364+
defer func() {
365+
assert.NoError(t, endp.Stop())
366+
}()
330367
defer testutils.WaitForConnsClose(t, endp.serv)
331368

332369
cl, err := smtp.Dial("127.0.0.1:" + testPort)
333370
if err != nil {
334371
t.Fatal(err)
335372
}
336-
defer cl.Close()
373+
defer func() {
374+
assert.NoError(t, cl.Close())
375+
}()
337376

338377
if err := cl.Hello("凱凱.invalid"); err != nil {
339378
t.Fatal(err)

‎internal/endpoint/smtp/submission_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/emersion/go-message/textproto"
2727
"github.com/emersion/go-smtp"
2828
"github.com/foxcpp/maddy/framework/module"
29+
"github.com/stretchr/testify/assert"
2930
)
3031

3132
func init() {
@@ -54,9 +55,9 @@ func TestSubmissionPrepare(t *testing.T) {
5455
// Synchronize the endpoint initialization.
5556
// Otherwise Close will race with Serve called by setupListeners.
5657
cl, _ := smtp.Dial("127.0.0.1:" + testPort)
57-
cl.Close()
58+
assert.NoError(t, cl.Close())
5859

59-
endp.Stop()
60+
assert.NoError(t, endp.Stop())
6061
}()
6162

6263
session, err := endp.NewSession(nil)

‎internal/target/queue/queue_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ func TestQueueDelivery_TemporaryFail(t *testing.T) {
323323
msg := readMsgChanTimeout(t, dt.committed, 5*time.Second)
324324
testutils.CheckMsgID(t, msg, "tester@example.com", []string{"tester1@example.org", "tester2@example.org"}, "")
325325

326-
q.Stop()
326+
assert.NoError(t, q.Stop())
327327
// No more retries scheduled, queue storage is clear.
328328
defer checkQueueDir(t, q, []string{})
329329
}

‎internal/target/remote/mxauth_test.go‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,9 @@ func TestRemoteDelivery_AuthMX_DNSSEC_Fail(t *testing.T) {
383383
tgt := testTarget(t, zones, extResolver, []module.MXAuthPolicy{
384384
&localPolicy{minMXLevel: module.MX_DNSSEC},
385385
})
386-
defer tgt.Stop()
386+
defer func() {
387+
assert.NoError(t, tgt.Stop())
388+
}()
387389

388390
_, err = testutils.DoTestDeliveryErr(t, tgt, "test@example.com", []string{"test@example.invalid"})
389391
if err == nil {
@@ -425,7 +427,9 @@ func TestRemoteDelivery_REQUIRETLS(t *testing.T) {
425427
testSTSPolicy(t, zones, mtastsGet),
426428
})
427429
tgt.tlsConfig = clientCfg
428-
defer tgt.Stop()
430+
defer func() {
431+
assert.NoError(t, tgt.Stop())
432+
}()
429433

430434
testutils.DoTestDeliveryMeta(t, tgt, "test@example.com", []string{"test@example.invalid"}, &module.MsgMetadata{
431435
OriginalFrom: "test@example.com",
@@ -466,7 +470,9 @@ func TestRemoteDelivery_REQUIRETLS_Fail(t *testing.T) {
466470
testSTSPolicy(t, zones, mtastsGet),
467471
})
468472
tgt.tlsConfig = clientCfg
469-
defer tgt.Stop()
473+
defer func() {
474+
assert.NoError(t, tgt.Stop())
475+
}()
470476

471477
if _, err := testutils.DoTestDeliveryErrMeta(t, tgt, "test@example.com", []string{"test@example.invalid"}, &module.MsgMetadata{
472478
OriginalFrom: "test@example.com",
@@ -512,7 +518,9 @@ func TestRemoteDelivery_REQUIRETLS_Relaxed(t *testing.T) {
512518
})
513519
tgt.relaxedREQUIRETLS = true
514520
tgt.tlsConfig = clientCfg
515-
defer tgt.Stop()
521+
defer func() {
522+
assert.NoError(t, tgt.Stop())
523+
}()
516524

517525
testutils.DoTestDeliveryMeta(t, tgt, "test@example.com", []string{"test@example.invalid"}, &module.MsgMetadata{
518526
OriginalFrom: "test@example.com",
@@ -549,7 +557,9 @@ func TestRemoteDelivery_REQUIRETLS_Relaxed_NoMXAuth(t *testing.T) {
549557
})
550558
tgt.relaxedREQUIRETLS = true
551559
tgt.tlsConfig = clientCfg
552-
defer tgt.Stop()
560+
defer func() {
561+
assert.NoError(t, tgt.Stop())
562+
}()
553563

554564
if _, err := testutils.DoTestDeliveryErrMeta(t, tgt, "test@example.com", []string{"test@example.invalid"}, &module.MsgMetadata{
555565
OriginalFrom: "test@example.com",
@@ -595,7 +605,9 @@ func TestRemoteDelivery_REQUIRETLS_Relaxed_NoTLS(t *testing.T) {
595605
})
596606
tgt.relaxedREQUIRETLS = true
597607
tgt.tlsConfig = nil
598-
defer tgt.Stop()
608+
defer func() {
609+
assert.NoError(t, tgt.Stop())
610+
}()
599611

600612
if _, err := testutils.DoTestDeliveryErrMeta(t, tgt, "test@example.com", []string{"test@example.invalid"}, &module.MsgMetadata{
601613
OriginalFrom: "test@example.com",
@@ -646,7 +658,9 @@ func TestRemoteDelivery_REQUIRETLS_Relaxed_TLSFail(t *testing.T) {
646658
srv.TLSConfig.MinVersion = tls.VersionTLS11
647659
srv.TLSConfig.MaxVersion = tls.VersionTLS11
648660
tgt.tlsConfig = clientCfg
649-
defer tgt.Stop()
661+
defer func() {
662+
assert.NoError(t, tgt.Stop())
663+
}()
650664

651665
if _, err := testutils.DoTestDeliveryErrMeta(t, tgt, "test@example.com", []string{"test@example.invalid"}, &module.MsgMetadata{
652666
OriginalFrom: "test@example.com",

0 commit comments

Comments
 (0)