TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-12 16:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/netstack: fix data race in tests

Browse Source 
This uses the helper function added in #6173 to avoid flakes like:
    https://github.com/tailscale/tailscale/actions/runs/3826912237/jobs/6511078024

Signed-off-by: Andrew Dunham <andrew@du.nham.ca>
Change-Id: If3f1d3b9c0f64ffcb4ba9a30d3522ec49484f993
This commit is contained in:
Andrew Dunham 2023-01-19 09:48:39 -05:00
parent dd7057682c
commit 58ad21b252
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wgengine/netstack/netstack_test.go
View File

@ -17,6 +17,7 @@ import (
"tailscale.com/net/tsaddr" "tailscale.com/net/tsaddr"
"tailscale.com/net/tsdial" "tailscale.com/net/tsdial"
"tailscale.com/net/tstun" "tailscale.com/net/tstun"
"tailscale.com/tstest"
"tailscale.com/types/ipproto" "tailscale.com/types/ipproto"
"tailscale.com/wgengine" "tailscale.com/wgengine"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
@ -89,12 +90,7 @@ func getMemStats() (ms runtime.MemStats) {
func makeNetstack(t *testing.T, config func(*Impl)) *Impl { func makeNetstack(t *testing.T, config func(*Impl)) *Impl {
tunDev := tstun.NewFake() tunDev := tstun.NewFake()
dialer := new(tsdial.Dialer) dialer := new(tsdial.Dialer)
logf := func(format string, args ...any) { logf := tstest.WhileTestRunningLogger(t)
if !t.Failed() {
t.Helper()
t.Logf(format, args...)
}
}
eng, err := wgengine.NewUserspaceEngine(logf, wgengine.Config{ eng, err := wgengine.NewUserspaceEngine(logf, wgengine.Config{
Tun: tunDev, Tun: tunDev,
Dialer: dialer, Dialer: dialer,