Skip to content

fix: improve trap logging #25

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

Open
wants to merge 1 commit into
base: mafredri/test-add-goleak
Choose a base branch
from
Open

fix: improve trap logging #25

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
9 changes: 7 additions & 2 deletions mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,6 +738,10 @@ type Trap struct {
unreleasedCalls int
}

func (t *Trap) String() string {
return fmt.Sprintf("%s(..., %v)", t.fn.String(), t.tags)
}

func (t *Trap) catch(c *apiCall) {
select {
case t.calls <- c:
Expand All @@ -763,12 +767,13 @@ func (t *Trap) Close() {
defer t.mock.mu.Unlock()
select {
case <-t.done:
t.mock.tb.Logf("trap %s already Closed()", t)
return // already closed
default:
}
if t.unreleasedCalls != 0 {
t.mock.tb.Helper()
t.mock.tb.Errorf("trap Closed() with %d unreleased calls", t.unreleasedCalls)
t.mock.tb.Errorf("trap %s Closed() with %d unreleased calls", t, t.unreleasedCalls)
}
for i, tr := range t.mock.traps {
if t == tr {
Expand Down Expand Up @@ -814,7 +819,7 @@ func (t *Trap) MustWait(ctx context.Context) *Call {
t.mock.tb.Helper()
c, err := t.Wait(ctx)
if err != nil {
t.mock.tb.Fatalf("context expired while waiting for trap: %s", err.Error())
t.mock.tb.Fatalf("context expired while waiting for trap %s: %s", t, err.Error())
}
return c
}
Expand Down