Fix formatting issues, linter warnings and test errors after logger refactor

Author: foxcpp

framework/dns/dnssec_test.go

@@ -129,7 +129,11 @@ func TestExtResolver_AuthLookupIPAddr(t *testing.T) {
 	// AD flag handling for use in DANE algorithms.
 
 	// Silence log messages about disregarded I/O errors.
-	log.DefaultLogger.Out = nil
+	oldLog := log.DefaultLogger
+	log.DefaultLogger = log.NopLogger
+	t.Cleanup(func() {
+		log.DefaultLogger = oldLog
+	})
 
 	test := func(aAct, aaaaAct TestSrvAction, aAD, aaaaAD, ad bool, addrs []net.IP, err bool) {
 		t.Helper()

internal/table/file_test.go

@@ -119,7 +119,7 @@ func TestFileReload(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	mod, err := NewFile(container.New(),"", "")
+	mod, err := NewFile(container.New(), "", "")
 	if err != nil {
 		t.Fatal(err)
 	}

internal/table/sql_query_test.go

@@ -34,7 +34,7 @@ import (
 
 func TestSQL(t *testing.T) {
 	path := testutils.Dir(t)
-	mod, err := NewSQL(container.New(),"sql_table", "")
+	mod, err := NewSQL(container.New(), "sql_table", "")
 	if err != nil {
 		t.Fatal("Module create failed:", err)
 	}

internal/target/remote/remote.go

@@ -208,8 +208,8 @@ func (rt *Target) InstanceName() string {
 type remoteDelivery struct {
 	rt       *Target
 	mailFrom string
-	msgMeta *module.MsgMetadata
-	log     *log.Logger
+	msgMeta  *module.MsgMetadata
+	log      *log.Logger
 
 	recipients  []string
 	connections map[string]*mxConn

internal/target/remote/remote_test.go

@@ -75,7 +75,7 @@ func testTarget(t *testing.T, zones map[string]mockdns.Zone, extResolver *dns.Ex
 }
 
 func testSTSPolicy(t *testing.T, zones map[string]mockdns.Zone, mtastsGet func(context.Context, string) (*mtasts.Policy, error)) *mtastsPolicy {
-	m, err := NewMTASTSPolicy(container.New(),"mx_auth.mtasts", "test")
+	m, err := NewMTASTSPolicy(container.New(), "mx_auth.mtasts", "test")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -101,7 +101,7 @@ func testSTSPolicy(t *testing.T, zones map[string]mockdns.Zone, mtastsGet func(c
 }
 
 func testDANEPolicy(t *testing.T, extR *dns.ExtResolver) *danePolicy {
-	m, err := NewDANEPolicy(container.New(),"mx_auth.dane", "test")
+	m, err := NewDANEPolicy(container.New(), "mx_auth.dane", "test")
 	if err != nil {
 		t.Fatal(err)
 	}

tests/t.go

@@ -217,7 +217,7 @@ func (t *T) buildCmd(additionalArgs ...string) *exec.Cmd {
 	args := []string{"-config", filepath.Join(t.testDir, "maddy.conf"),
 		"-debug.smtpport", remoteSmtp,
 		"-debug.dnsoverride", t.dnsServ.LocalAddr().String(),
-		"-log", "/tmp/test.log"}
+	}
 
 	if CoverageOut != "" {
 		args = append(args, "-test.coverprofile", CoverageOut+"."+strconv.FormatInt(time.Now().UnixNano(), 16))