webnet/tailscale
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

wgengine/magicsock: fix data race in TestSetDERPMapDoReStun

Browse Source 
SetDERPMap spawns a goroutine that calls ReSTUN, which logs via the
test logger. If the test returns before that goroutine logs, the
goroutine races with testing cleanup.

Use tstest.WhileTestRunningLogger so the goroutine's logf call becomes
a no-op once the test finishes.

Fixes #19829

Change-Id: I1097f98e40ffd1c5dd7fb7a715c918255853e3c6
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2026-05-21 08:51:50 -07:00
committed by Brad Fitzpatrick
parent 7ebca58042
commit 2703f91174
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wgengine/magicsock/derp_test.go
+3 -1
View File
@@ -106,7 +106,9 @@ func TestSetDERPMapDoReStun(t *testing.T) {
bus := eventbustest.NewBus(t)
ht := health.NewTracker(bus)
c := newConn(t.Logf)
// Use WhileTestRunningLogger so the goroutine spawned by setDERPMap
// (which calls ReSTUN, which logs) doesn't race with test cleanup.
c := newConn(tstest.WhileTestRunningLogger(t))
ec := bus.Client("magicsock.Conn.Test")
c.eventClient = ec
c.homeDERPChangedPub = eventbus.Publish[HomeDERPChanged](ec)