Small changes in detector goroutines leak

Author: asmyasnikov

internal/xtest/leak.go

@@ -1,13 +1,14 @@
 package xtest
 
 import (
+	"fmt"
 	"regexp"
 	"runtime"
 	"strings"
 	"testing"
 )
 
-func checkGoroutinesLeak(onLeak func(goroutines []string)) {
+func findGoroutinesLeak() error {
 	var bb []byte
 	for size := 1 << 16; ; size *= 2 {
 		bb = make([]byte, size)
@@ -61,14 +62,14 @@ func checkGoroutinesLeak(onLeak func(goroutines []string)) {
 		unexpectedGoroutines = append(unexpectedGoroutines, g)
 	}
 	if l := len(unexpectedGoroutines); l > 0 {
-		onLeak(goroutines)
+		return fmt.Errorf("found %d unexpected goroutines:\n%s", len(goroutines), strings.Join(goroutines, "\n"))
 	}
+
+	return nil
 }
 
 func CheckGoroutinesLeak(tb testing.TB) {
-	tb.Helper()
-	checkGoroutinesLeak(func(goroutines []string) {
-		tb.Helper()
-		tb.Errorf("found %d unexpected goroutines:\n%s", len(goroutines), strings.Join(goroutines, "\n"))
-	})
+	if err := findGoroutinesLeak(); err != nil {
+		tb.Errorf("leak goroutines detected: %v", err)
+	}
 }

internal/xtest/leak_test.go

@@ -1,6 +1,7 @@
 package xtest
 
 import (
+	"sync/atomic"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -9,32 +10,44 @@ import (
 func TestCheckGoroutinesLeak(t *testing.T) {
 	t.Run("Leak", func(t *testing.T) {
 		TestManyTimes(t, func(t testing.TB) {
-			ch := make(chan struct{})
-			require.Panics(t, func() {
-				defer checkGoroutinesLeak(func([]string) {
-					panic("test")
-				})
+			var (
+				leakDetected atomic.Bool
+				ch           = make(chan struct{})
+			)
+			func() {
+				defer func() {
+					if err := findGoroutinesLeak(); err != nil {
+						leakDetected.Store(true)
+					}
+				}()
 				go func() {
 					<-ch
 				}()
-			})
+			}()
 			close(ch)
+			require.True(t, leakDetected.Load())
 		})
 	})
 	t.Run("NoLeak", func(t *testing.T) {
 		TestManyTimes(t, func(t testing.TB) {
-			require.NotPanics(t, func() {
-				defer checkGoroutinesLeak(func([]string) {
-					panic("test")
-				})
-				ch := make(chan struct{})
+			var (
+				leakDetected atomic.Bool
+				ch           = make(chan struct{})
+			)
+			func() {
+				defer func() {
+					if err := findGoroutinesLeak(); err != nil {
+						leakDetected.Store(true)
+					}
+				}()
 				defer func() {
 					<-ch
 				}()
 				go func() {
 					close(ch)
 				}()
-			})
+			}()
+			require.False(t, leakDetected.Load())
 		})
 	})
 }