Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: stop logging after test cleanup #19

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
merged 1 commit into from
May 27, 2025
Merged

fix: stop logging after test cleanup #19

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
34 changes: 26 additions & 8 deletions mock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ import (
// Mock is the testing implementation of Clock. It tracks a time that monotonically increases
// during a test, triggering any timers or tickers automatically.
type Mock struct {
tb testing.TB
mu sync.Mutex
tb testing.TB
mu sync.Mutex
testOver bool

// cur is the current time
cur time.Time
Expand Down Expand Up @@ -197,7 +198,9 @@ func (m *Mock) matchCallLocked(c *apiCall) {
traps = append(traps, t)
}
}
m.tb.Logf("Mock Clock - %s call, matched %d traps", c, len(traps))
if !m.testOver {
m.tb.Logf("Mock Clock - %s call, matched %d traps", c, len(traps))
}
if len(traps) == 0 {
return
}
Expand Down Expand Up @@ -261,7 +264,9 @@ func (m *Mock) Advance(d time.Duration) AdvanceWaiter {
m.tb.Helper()
w := AdvanceWaiter{tb: m.tb, ch: make(chan struct{})}
m.mu.Lock()
m.tb.Logf("Mock Clock - Advance(%s)", d)
if !m.testOver {
m.tb.Logf("Mock Clock - Advance(%s)", d)
}
fin := m.cur.Add(d)
// nextTime.IsZero implies no events scheduled.
if m.nextTime.IsZero() || fin.Before(m.nextTime) {
Expand Down Expand Up @@ -309,7 +314,9 @@ func (m *Mock) Set(t time.Time) AdvanceWaiter {
m.tb.Helper()
w := AdvanceWaiter{tb: m.tb, ch: make(chan struct{})}
m.mu.Lock()
m.tb.Logf("Mock Clock - Set(%s)", t)
if !m.testOver {
m.tb.Logf("Mock Clock - Set(%s)", t)
}
if t.Before(m.cur) {
defer close(w.ch)
defer m.mu.Unlock()
Expand Down Expand Up @@ -346,7 +353,9 @@ func (m *Mock) Set(t time.Time) AdvanceWaiter {
// wait for the timer/tick event(s) to finish.
func (m *Mock) AdvanceNext() (time.Duration, AdvanceWaiter) {
m.mu.Lock()
m.tb.Logf("Mock Clock - AdvanceNext()")
if !m.testOver {
m.tb.Logf("Mock Clock - AdvanceNext()")
}
m.tb.Helper()
w := AdvanceWaiter{tb: m.tb, ch: make(chan struct{})}
if m.nextTime.IsZero() {
Expand Down Expand Up @@ -435,7 +444,9 @@ func (m *Mock) Trap() Trapper {
func (m *Mock) newTrap(fn clockFunction, tags []string) *Trap {
m.mu.Lock()
defer m.mu.Unlock()
m.tb.Logf("Mock Clock - Trap %s(..., %v)", fn, tags)
if !m.testOver {
m.tb.Logf("Mock Clock - Trap %s(..., %v)", fn, tags)
}
tr := &Trap{
fn: fn,
tags: tags,
Expand All @@ -455,10 +466,17 @@ func NewMock(tb testing.TB) *Mock {
if err != nil {
panic(err)
}
return &Mock{
m := &Mock{
tb: tb,
cur: cur,
}
tb.Cleanup(func() {
m.mu.Lock()
defer m.mu.Unlock()
m.testOver = true
tb.Logf("Mock Clock - test cleanup; will no longer log clock events")
})
return m
}

var _ Clock = &Mock{}
Expand Down