mirror of
https://github.com/coder/coder.git
synced 2025-07-18 14:17:22 +00:00
chore: update testutil chan helpers (#17408)
This commit is contained in:
@ -37,7 +37,7 @@ func TestWatchdog_NoTimeout(t *testing.T) {
|
||||
|
||||
// we subscribe after starting the timer, so we know the timer also starts
|
||||
// from the baseline.
|
||||
sub := testutil.RequireRecvCtx(ctx, t, fPS.subs)
|
||||
sub := testutil.TryReceive(ctx, t, fPS.subs)
|
||||
require.Equal(t, pubsub.EventPubsubWatchdog, sub.event)
|
||||
|
||||
// 5 min / 15 sec = 20, so do 21 ticks
|
||||
@ -45,7 +45,7 @@ func TestWatchdog_NoTimeout(t *testing.T) {
|
||||
d, w := mClock.AdvanceNext()
|
||||
w.MustWait(ctx)
|
||||
require.LessOrEqual(t, d, 15*time.Second)
|
||||
p := testutil.RequireRecvCtx(ctx, t, fPS.pubs)
|
||||
p := testutil.TryReceive(ctx, t, fPS.pubs)
|
||||
require.Equal(t, pubsub.EventPubsubWatchdog, p)
|
||||
mClock.Advance(30 * time.Millisecond). // reasonable round-trip
|
||||
MustWait(ctx)
|
||||
@ -67,7 +67,7 @@ func TestWatchdog_NoTimeout(t *testing.T) {
|
||||
sc, err := subTrap.Wait(ctx) // timer.Stop() called
|
||||
require.NoError(t, err)
|
||||
sc.Release()
|
||||
err = testutil.RequireRecvCtx(ctx, t, errCh)
|
||||
err = testutil.TryReceive(ctx, t, errCh)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
@ -93,7 +93,7 @@ func TestWatchdog_Timeout(t *testing.T) {
|
||||
|
||||
// we subscribe after starting the timer, so we know the timer also starts
|
||||
// from the baseline.
|
||||
sub := testutil.RequireRecvCtx(ctx, t, fPS.subs)
|
||||
sub := testutil.TryReceive(ctx, t, fPS.subs)
|
||||
require.Equal(t, pubsub.EventPubsubWatchdog, sub.event)
|
||||
|
||||
// 5 min / 15 sec = 20, so do 19 ticks without timing out
|
||||
@ -101,7 +101,7 @@ func TestWatchdog_Timeout(t *testing.T) {
|
||||
d, w := mClock.AdvanceNext()
|
||||
w.MustWait(ctx)
|
||||
require.LessOrEqual(t, d, 15*time.Second)
|
||||
p := testutil.RequireRecvCtx(ctx, t, fPS.pubs)
|
||||
p := testutil.TryReceive(ctx, t, fPS.pubs)
|
||||
require.Equal(t, pubsub.EventPubsubWatchdog, p)
|
||||
mClock.Advance(30 * time.Millisecond). // reasonable round-trip
|
||||
MustWait(ctx)
|
||||
@ -117,9 +117,9 @@ func TestWatchdog_Timeout(t *testing.T) {
|
||||
d, w := mClock.AdvanceNext()
|
||||
w.MustWait(ctx)
|
||||
require.LessOrEqual(t, d, 15*time.Second)
|
||||
p := testutil.RequireRecvCtx(ctx, t, fPS.pubs)
|
||||
p := testutil.TryReceive(ctx, t, fPS.pubs)
|
||||
require.Equal(t, pubsub.EventPubsubWatchdog, p)
|
||||
testutil.RequireRecvCtx(ctx, t, uut.Timeout())
|
||||
testutil.TryReceive(ctx, t, uut.Timeout())
|
||||
|
||||
err = uut.Close()
|
||||
require.NoError(t, err)
|
||||
|
Reference in New Issue
Block a user