From 14adf5b71783d039c1a8a978eea5ce75f081144f Mon Sep 17 00:00:00 2001 From: Alex Chan Date: Mon, 8 Sep 2025 15:27:24 +0100 Subject: [PATCH] utils/expvarx, tstest/integration: mark two tests as known flaky (#17052) * utils/expvarx: mark TestSafeFuncHappyPath as known flaky Updates #15348 Signed-off-by: Alex Chan * tstest/integration: mark TestCollectPanic as known flaky Updates #15865 Signed-off-by: Alex Chan --------- Signed-off-by: Alex Chan --- tstest/integration/integration_test.go | 1 + util/expvarx/expvarx_test.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/tstest/integration/integration_test.go b/tstest/integration/integration_test.go index 7cb251f31..de464108c 100644 --- a/tstest/integration/integration_test.go +++ b/tstest/integration/integration_test.go @@ -170,6 +170,7 @@ func TestControlKnobs(t *testing.T) { } func TestCollectPanic(t *testing.T) { + flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/15865") tstest.Shard(t) tstest.Parallel(t) env := NewTestEnv(t) diff --git a/util/expvarx/expvarx_test.go b/util/expvarx/expvarx_test.go index 74ec152f4..50131dfb3 100644 --- a/util/expvarx/expvarx_test.go +++ b/util/expvarx/expvarx_test.go @@ -10,6 +10,8 @@ import ( "sync/atomic" "testing" "time" + + "tailscale.com/cmd/testwrapper/flakytest" ) func ExampleNewSafeFunc() { @@ -52,6 +54,7 @@ func ExampleNewSafeFunc() { } func TestSafeFuncHappyPath(t *testing.T) { + flakytest.Mark(t, "https://github.com/tailscale/tailscale/issues/15348") var count int f := NewSafeFunc(expvar.Func(func() any { count++