Skip to content

Commit

Permalink
Merge pull request #766 from johnweldon/jw4/fix-logger-errors
Browse files Browse the repository at this point in the history
framework/log: Fix Logger usages in tests
  • Loading branch information
foxcpp authored Feb 22, 2025
2 parents 95ba6bf + 4a5f379 commit 9cf2adb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion internal/storage/blob/test_blob.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ func TestStore(t *testing.T, newStore func() module.BlobStore, cleanStore func(m
prng := rand.New(randSrc)
store := newStore()

l := testutils.Logger(t, "imapsql")
b, err := imapsql.New("sqlite3", ":memory:",
imapsql2.ExtBlobStore{Base: store}, imapsql.Opts{
PRNG: prng,
Log: testutils.Logger(t, "imapsql"),
Log: &l,
},
)
if err != nil {
Expand Down
3 changes: 2 additions & 1 deletion internal/target/remote/dane_delivery_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ import (
)

func targetWithExtResolver(t *testing.T, zones map[string]mockdns.Zone) (*mockdns.Server, *Target) {
dnsSrv, err := mockdns.NewServerWithLogger(zones, testutils.Logger(t, "mockdns"), false)
l := testutils.Logger(t, "mockdns")
dnsSrv, err := mockdns.NewServerWithLogger(zones, &l, false)
if err != nil {
t.Fatal(err)
}
Expand Down
6 changes: 4 additions & 2 deletions internal/target/remote/mxauth_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ func TestRemoteDelivery_AuthMX_DNSSEC(t *testing.T) {
},
}

dnsSrv, err := mockdns.NewServerWithLogger(zones, testutils.Logger(t, "mockdns"), false)
l := testutils.Logger(t, "mockdns")
dnsSrv, err := mockdns.NewServerWithLogger(zones, &l, false)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -342,7 +343,8 @@ func TestRemoteDelivery_AuthMX_DNSSEC_Fail(t *testing.T) {
},
}

dnsSrv, err := mockdns.NewServerWithLogger(zones, testutils.Logger(t, "mockdns"), false)
l := testutils.Logger(t, "mockdns")
dnsSrv, err := mockdns.NewServerWithLogger(zones, &l, false)
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit 9cf2adb

Please sign in to comment.