Add a few more expected TestMain goroutines to ignore list

Signed-off-by: Matt Lord <[email protected]>
vitessio · May 26, 2024 · d2fea8d · d2fea8d
1 parent 3839e90
commit d2fea8d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/go/test/utils/noleak.go b/go/test/utils/noleak.go
@@ -84,6 +84,10 @@ func ensureNoGoroutines() error {
 		goleak.IgnoreTopFunction("vitess.io/vitess/go/pools/smartconnpool.(*ConnPool[...]).runWorker.func1"),
 		goleak.IgnoreTopFunction("vitess.io/vitess/go/stats.(*Rates).track"),
 		goleak.IgnoreTopFunction("vitess.io/vitess/go/timer.(*Timer).run"),
+		goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/srvtopo.NewResilientServer.NewSrvVSchemaWatcher.func1"),
+		goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/srvtopo.NewResilientServer.NewSrvVSchemaWatcher.func2"),
+		goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/topo/memorytopo.(*Conn).Watch.func1"),
+		goleak.IgnoreTopFunction("vitess.io/vitess/go/vt/topo.(*Server).WatchSrvVSchema.func1"),
 		goleak.IgnoreTopFunction("testing.tRunner.func1"),
 	}
 

diff --git a/go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go b/go/vt/vttablet/tabletmanager/vreplication/vplayer_test.go
@@ -34,11 +34,6 @@ func TestStallHandler(t *testing.T) {
 	ctx, cancel := context.WithTimeout(lctx, tme)
 	defer cancel()
 
-	ovpd := vplayerProgressDeadline
-	vplayerProgressDeadline = tme / 10
-	defer func() {
-		vplayerProgressDeadline = ovpd
-	}()
 	concurrency := 10000
 	dl := time.Duration(10 * time.Second)