review

ethanndickson · ethanndickson · commit 176a375365de · 2025-06-03T10:52:32.000Z
diff --git a/tailnet/derpmap_test.go b/tailnet/derpmap_test.go
@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"tailscale.com/ipn/ipnstate"
 	"tailscale.com/tailcfg"
 
 	"github.com/coder/coder/v2/tailnet"
@@ -236,3 +237,37 @@ func TestExtractDERPLatency(t *testing.T) {
 		require.Empty(t, latencyMs)
 	})
 }
+
+func TestExtractPreferredDERPName(t *testing.T) {
+	t.Parallel()
+	derpMap := &tailcfg.DERPMap{
+		Regions: map[int]*tailcfg.DERPRegion{
+			1: {RegionName: "New York"},
+			2: {RegionName: "London"},
+		},
+	}
+
+	t.Run("UsesPingRegion", func(t *testing.T) {
+		t.Parallel()
+		pingResult := &ipnstate.PingResult{DERPRegionID: 2}
+		node := &tailnet.Node{PreferredDERP: 1}
+		result := tailnet.ExtractPreferredDERPName(pingResult, node, derpMap)
+		require.Equal(t, "London", result)
+	})
+
+	t.Run("UsesNodePreferred", func(t *testing.T) {
+		t.Parallel()
+		pingResult := &ipnstate.PingResult{DERPRegionID: 0}
+		node := &tailnet.Node{PreferredDERP: 1}
+		result := tailnet.ExtractPreferredDERPName(pingResult, node, derpMap)
+		require.Equal(t, "New York", result)
+	})
+
+	t.Run("UnknownRegion", func(t *testing.T) {
+		t.Parallel()
+		pingResult := &ipnstate.PingResult{DERPRegionID: 99}
+		node := &tailnet.Node{PreferredDERP: 1}
+		result := tailnet.ExtractPreferredDERPName(pingResult, node, derpMap)
+		require.Equal(t, "Unnamed 99", result)
+	})
+}
diff --git a/vpn/tunnel_internal_test.go b/vpn/tunnel_internal_test.go
@@ -461,7 +461,7 @@ func TestTunnel_sendAgentUpdate(t *testing.T) {
 	}
 
 	// Latency is gathered in the background, so it'll eventually be sent
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		mClock.AdvanceNext()
 		req = testutil.TryReceive(ctx, t, mgr.requests)
 		if len(req.msg.GetPeerUpdate().UpsertedAgents) == 0 {
@@ -474,7 +474,7 @@ func TestTunnel_sendAgentUpdate(t *testing.T) {
 			return false
 		}
 		return req.msg.GetPeerUpdate().UpsertedAgents[0].LastPing.PreferredDerp == "Coder Region"
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	// Upsert a new agent
 	err = tun.Update(tailnet.WorkspaceUpdate{
@@ -538,7 +538,7 @@ func TestTunnel_sendAgentUpdate(t *testing.T) {
 	require.Equal(t, hsTime, req.msg.GetPeerUpdate().UpsertedAgents[0].LastHandshake.AsTime())
 
 	// Eventually the second agent's latency is set
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		mClock.AdvanceNext()
 		req = testutil.TryReceive(ctx, t, mgr.requests)
 		if len(req.msg.GetPeerUpdate().UpsertedAgents) == 0 {
@@ -551,7 +551,7 @@ func TestTunnel_sendAgentUpdate(t *testing.T) {
 			return false
 		}
 		return req.msg.GetPeerUpdate().UpsertedAgents[0].LastPing.PreferredDerp == "Coder Region"
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 }
 
 func TestTunnel_sendAgentUpdateReconnect(t *testing.T) {
