Skip to content

framework/log: Fix Logger usages in tests #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foxcpp merged 1 commit into from
Feb 22, 2025
+8 −4
Merged

framework/log: Fix Logger usages in tests #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion internal/storage/blob/test_blob.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
testSTSPolicy(t, zones, mtastsGet),
})
tgt.tlsConfig = clientCfg
defer tgt.Stop()

Check failure on line 66 in internal/target/remote/mxauth_test.go

View workflow job for this annotation

GitHub Actions / Lint 

Error return value of `tgt.Stop` is not checked (errcheck)

testutils.DoTestDelivery(t, tgt, "[email protected]", []string{"[email protected]"})
be.CheckMsg(t, 0, "[email protected]", []string{"[email protected]"})
Expand Down Expand Up @@ -108,7 +108,7 @@
&localPolicy{minMXLevel: module.MX_MTASTS},
})
tgt.tlsConfig = clientCfg
defer tgt.Stop()

Check failure on line 111 in internal/target/remote/mxauth_test.go

View workflow job for this annotation

GitHub Actions / Lint 

Error return value of `tgt.Stop` is not checked (errcheck)

testutils.DoTestDelivery(t, tgt, "[email protected]", []string{"[email protected]"})
be.CheckMsg(t, 0, "[email protected]", []string{"[email protected]"})
Expand Down Expand Up @@ -148,7 +148,7 @@
&localPolicy{minMXLevel: module.MX_MTASTS},
})
tgt.tlsConfig = clientCfg
defer tgt.Stop()

Check failure on line 151 in internal/target/remote/mxauth_test.go

View workflow job for this annotation

GitHub Actions / Lint 

Error return value of `tgt.Stop` is not checked (errcheck)

_, err := testutils.DoTestDeliveryErr(t, tgt, "[email protected]", []string{"[email protected]"})
if err == nil {
Expand Down Expand Up @@ -303,7 +303,8 @@
},
}

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 @@
},
}

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
Loading