From 6da1dc84de57c4514665e0808f584e3662299119 Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Tue, 19 Mar 2024 18:32:34 -0400 Subject: [PATCH] wgengine: fix logger data race in tests Observed in: https://github.com/tailscale/tailscale/actions/runs/8350904950/job/22858266932?pr=11463 Updates #11226 Signed-off-by: Andrew Dunham Change-Id: I9b57db4b34b6ad91d240cd9fa7e344fc0376d52d --- wgengine/userspace_ext_test.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wgengine/userspace_ext_test.go b/wgengine/userspace_ext_test.go index 67b337051..4a3f6127c 100644 --- a/wgengine/userspace_ext_test.go +++ b/wgengine/userspace_ext_test.go @@ -9,6 +9,7 @@ import ( "github.com/tailscale/wireguard-go/tun" "tailscale.com/net/tstun" "tailscale.com/tsd" + "tailscale.com/tstest" "tailscale.com/types/logger" "tailscale.com/wgengine" "tailscale.com/wgengine/netstack" @@ -17,7 +18,10 @@ import ( func TestIsNetstack(t *testing.T) { sys := new(tsd.System) - e, err := wgengine.NewUserspaceEngine(t.Logf, wgengine.Config{SetSubsystem: sys.Set}) + e, err := wgengine.NewUserspaceEngine( + tstest.WhileTestRunningLogger(t), + wgengine.Config{SetSubsystem: sys.Set}, + ) if err != nil { t.Fatal(err) }