fix

Author: asmyasnikov

internal/xtest/leak.go

@@ -5,26 +5,20 @@ import (
 	"runtime"
 	"strings"
 	"testing"
-	"time"
 )
 
-func checkGoroutinesLeak(onLeak func(goroutines []string)) {
-	var (
-		bb               = make([]byte, 2<<32)
-		currentGoroutine string
-	)
-
-	time.Sleep(time.Millisecond)
-
-	if n := runtime.Stack(bb, false); n < len(bb) {
-		currentGoroutine = string(regexp.MustCompile(`^goroutine \d+ `).Find(bb[:n]))
-	}
-
-	if n := runtime.Stack(bb, true); n < len(bb) {
-		bb = bb[:n]
+func goroutineStack(all bool) []byte {
+	for i := 1 << 16; ; i *= 2 {
+		bb := make([]byte, i)
+		if n := runtime.Stack(bb, all); n < i {
+			return bb[:n]
+		}
 	}
+}
 
-	goroutines := strings.Split(string(bb), "\n\n")
+func checkGoroutinesLeak(onLeak func(goroutines []string)) {
+	currentGoroutine := string(regexp.MustCompile(`^goroutine \d+ `).Find(goroutineStack(false)))
+	goroutines := strings.Split(string(goroutineStack(true)), "\n\n")
 	unexpectedGoroutines := make([]string, 0, len(goroutines))
 
 	for _, g := range goroutines {
@@ -67,8 +61,11 @@ func checkGoroutinesLeak(onLeak func(goroutines []string)) {
 
 func CheckGoroutinesLeak(tb testing.TB) {
 	tb.Helper()
-	checkGoroutinesLeak(func(stacks []string) {
+	checkGoroutinesLeak(func(goroutines []string) {
 		tb.Helper()
-		tb.Errorf("found %d unexpected goroutines:\n%s", len(stacks), strings.Join(stacks, "\n"))
+		tb.Errorf("found %d unexpected goroutines:\n%s",
+			len(goroutines),
+			strings.Join(goroutines, "\n"),
+		)
 	})
 }

internal/xtest/leak_test.go

@@ -2,7 +2,6 @@ package xtest
 
 import (
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -13,29 +12,29 @@ func TestCheckGoroutinesLeak(t *testing.T) {
 			ch := make(chan struct{})
 			require.Panics(t, func() {
 				defer checkGoroutinesLeak(func(goroutines []string) {
-					panic("panic")
+					panic(goroutines)
 				})
 				go func() {
 					<-ch
 				}()
 			})
 			close(ch)
-		}, StopAfter(13*time.Second))
+		})
 	})
 	t.Run("NoLeak", func(t *testing.T) {
 		TestManyTimes(t, func(t testing.TB) {
-			ch := make(chan struct{})
 			require.NotPanics(t, func() {
 				defer checkGoroutinesLeak(func(goroutines []string) {
-					panic("panic")
+					panic(goroutines)
 				})
+				ch := make(chan struct{})
 				defer func() {
 					<-ch
 				}()
 				go func() {
 					close(ch)
 				}()
 			})
-		}, StopAfter(13*time.Second))
+		})
 	})
 }

tests/integration/basic_example_database_sql_bindings_test.go

@@ -26,7 +26,7 @@ import (
 )
 
 func TestBasicExampleDatabaseSqlBindings(t *testing.T) {
-	defer simpleDetectGoroutineLeak(t)
+	defer xtest.CheckGoroutinesLeak(t)
 
 	folder := t.Name()
 

tests/integration/basic_example_database_sql_test.go

@@ -27,7 +27,7 @@ import (
 )
 
 func TestBasicExampleDatabaseSql(t *testing.T) {
-	defer simpleDetectGoroutineLeak(t)
+	defer xtest.CheckGoroutinesLeak(t)
 
 	folder := t.Name()
 

tests/integration/helpers_test.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"runtime"
 	"strings"
 	"testing"
 	"text/template"
@@ -469,16 +468,3 @@ func driverEngine(db *sql.DB) (engine xsql.Engine) {
 
 	return engine
 }
-
-func simpleDetectGoroutineLeak(t *testing.T) {
-	// 1) testing.go => main.main()
-	// 2) current test
-	const expectedGoroutinesCount = 2
-	if num := runtime.NumGoroutine(); num > expectedGoroutinesCount {
-		bb := make([]byte, 2<<32)
-		if n := runtime.Stack(bb, true); n < len(bb) {
-			bb = bb[:n]
-		}
-		t.Error(fmt.Sprintf("unexpected goroutines:\n%s\n", string(bb[runtime.Stack(bb, false)+1:])))
-	}
-}