Skip to content

fix: fixed flaking VPN tunnel tests & bump coder/quartz to 0.1.3 #17737

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.

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 2 commits into from
May 9, 2025
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
added comments
  • Loading branch information
ibetitsmike committed May 9, 2025
commit 7f6e14df7c6866d46f76fff36036df7e325be6c7
5 changes: 3 additions & 2 deletions vpn/tunnel_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,8 @@ func setupTunnel(t *testing.T, ctx context.Context, client *fakeClient, mClock *
t.Cleanup(func() { _ = mp.Close() })
t.Cleanup(func() { _ = tp.Close() })
logger := testutil.Logger(t)

// We're creating a trap for the mClock to ensure that
// AdvanceNext() is not called before the ticker is created.
trap := mClock.Trap().NewTicker()
defer trap.Close()

Expand All @@ -722,7 +723,7 @@ func setupTunnel(t *testing.T, ctx context.Context, client *fakeClient, mClock *
err = testutil.TryReceive(ctx, t, errCh)
require.NoError(t, err)
mgr.start()

// We're releasing the trap to allow the clock to advance the ticker.
trap.MustWait(ctx).Release()
return tun, mgr
}
Expand Down
Loading