Browse Source

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 <[email protected]>

* tstest/integration: mark TestCollectPanic as known flaky

Updates #15865

Signed-off-by: Alex Chan <[email protected]>

---------

Signed-off-by: Alex Chan <[email protected]>
Alex Chan 5 months ago
parent
commit
14adf5b717
2 changed files with 4 additions and 0 deletions
  1. 1 0
      tstest/integration/integration_test.go
  2. 3 0
      util/expvarx/expvarx_test.go

+ 1 - 0
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)

+ 3 - 0
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++