Skip to content

Commit 9cf2adb

Browse files
authored
Merge pull request #766 from johnweldon/jw4/fix-logger-errors
framework/log: Fix Logger usages in tests
2 parents 95ba6bf + 4a5f379 commit 9cf2adb

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

internal/storage/blob/test_blob.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ func TestStore(t *testing.T, newStore func() module.BlobStore, cleanStore func(m
3939
prng := rand.New(randSrc)
4040
store := newStore()
4141

42+
l := testutils.Logger(t, "imapsql")
4243
b, err := imapsql.New("sqlite3", ":memory:",
4344
imapsql2.ExtBlobStore{Base: store}, imapsql.Opts{
4445
PRNG: prng,
45-
Log: testutils.Logger(t, "imapsql"),
46+
Log: &l,
4647
},
4748
)
4849
if err != nil {

internal/target/remote/dane_delivery_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ import (
3232
)
3333

3434
func targetWithExtResolver(t *testing.T, zones map[string]mockdns.Zone) (*mockdns.Server, *Target) {
35-
dnsSrv, err := mockdns.NewServerWithLogger(zones, testutils.Logger(t, "mockdns"), false)
35+
l := testutils.Logger(t, "mockdns")
36+
dnsSrv, err := mockdns.NewServerWithLogger(zones, &l, false)
3637
if err != nil {
3738
t.Fatal(err)
3839
}

internal/target/remote/mxauth_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@ func TestRemoteDelivery_AuthMX_DNSSEC(t *testing.T) {
303303
},
304304
}
305305

306-
dnsSrv, err := mockdns.NewServerWithLogger(zones, testutils.Logger(t, "mockdns"), false)
306+
l := testutils.Logger(t, "mockdns")
307+
dnsSrv, err := mockdns.NewServerWithLogger(zones, &l, false)
307308
if err != nil {
308309
t.Fatal(err)
309310
}
@@ -342,7 +343,8 @@ func TestRemoteDelivery_AuthMX_DNSSEC_Fail(t *testing.T) {
342343
},
343344
}
344345

345-
dnsSrv, err := mockdns.NewServerWithLogger(zones, testutils.Logger(t, "mockdns"), false)
346+
l := testutils.Logger(t, "mockdns")
347+
dnsSrv, err := mockdns.NewServerWithLogger(zones, &l, false)
346348
if err != nil {
347349
t.Fatal(err)
348350
}

0 commit comments

Comments
 (0)