1. Fixed mongo goroutine leak

2. Fixed linters error
avito-tech · Feb 4, 2024 · bdef678 · bdef678
1 parent bfcce81
commit bdef678
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 16 deletions.
diff --git a/gorm/transaction_test.go b/gorm/transaction_test.go
@@ -214,7 +214,7 @@ func TestTransaction_awaitDone_byContext(t *testing.T) {
 	dbmock.ExpectBegin()
 	dbmock.ExpectRollback()
 	dbmock.ExpectClose()
-	t.Cleanup(func() {
+	test.Cleanup(t, func() {
 		require.NoError(t, db.Close())
 	})
 
@@ -256,7 +256,7 @@ func TestTransaction_awaitDone_byRollback(t *testing.T) {
 	dbmock.ExpectBegin()
 	dbmock.ExpectRollback()
 	dbmock.ExpectClose()
-	t.Cleanup(func() {
+	test.Cleanup(t, func() {
 		require.NoError(t, db.Close())
 	})
 

diff --git a/internal/test/cleanup.go b/internal/test/cleanup.go
@@ -0,0 +1,7 @@
+//go:build !go1.14
+// +build !go1.14
+
+package test
+
+func Cleanup(t *testing.T, fn func()) {
+}
diff --git a/internal/test/cleanup_go1.14.go b/internal/test/cleanup_go1.14.go
@@ -0,0 +1,12 @@
+//go:build go1.14
+// +build go1.14
+
+package test
+
+import (
+	"testing"
+)
+
+func Cleanup(t *testing.T, fn func()) {
+	t.Cleanup(fn)
+}
diff --git a/pgxv4/goroutine_leak_test.go b/pgxv4/goroutine_leak_test.go
@@ -0,0 +1,14 @@
+//go:build go1.20
+// +build go1.20
+
+package pgxv4
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}
diff --git a/pgxv4/transaction_test.go b/pgxv4/transaction_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/pashagolub/pgxmock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/goleak"
 
 	"github.com/avito-tech/go-transaction-manager/internal/mock"
 	"github.com/avito-tech/go-transaction-manager/trm"
@@ -22,10 +21,6 @@ import (
 	"github.com/avito-tech/go-transaction-manager/trm/settings"
 )
 
-func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m)
-}
-
 func TestTransaction(t *testing.T) {
 	t.Parallel()
 

diff --git a/pgxv5/goroutine_leak_test.go b/pgxv5/goroutine_leak_test.go
@@ -0,0 +1,14 @@
+//go:build go1.20
+// +build go1.20
+
+package pgxv5
+
+import (
+	"testing"
+
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	goleak.VerifyTestMain(m)
+}
diff --git a/pgxv5/transaction_test.go b/pgxv5/transaction_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/pashagolub/pgxmock/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/goleak"
 
 	"github.com/avito-tech/go-transaction-manager/internal/mock"
 	"github.com/avito-tech/go-transaction-manager/trm"
@@ -22,10 +21,6 @@ import (
 	"github.com/avito-tech/go-transaction-manager/trm/settings"
 )
 
-func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m)
-}
-
 func TestTransaction(t *testing.T) {
 	t.Parallel()
 

diff --git a/sql/transaction_test.go b/sql/transaction_test.go
@@ -223,7 +223,7 @@ func TestTransaction_awaitDone_byContext(t *testing.T) {
 	db, dbmock := test.NewDBMock()
 	dbmock.ExpectBegin()
 	dbmock.ExpectClose()
-	t.Cleanup(func() {
+	test.Cleanup(t, func() {
 		require.NoError(t, db.Close())
 	})
 
@@ -265,7 +265,7 @@ func TestTransaction_awaitDone_byRollback(t *testing.T) {
 	dbmock.ExpectBegin()
 	dbmock.ExpectRollback()
 	dbmock.ExpectClose()
-	t.Cleanup(func() {
+	test.Cleanup(t, func() {
 		_ = db.Close()
 	})
 

diff --git a/sqlx/transaction_test.go b/sqlx/transaction_test.go
@@ -226,7 +226,7 @@ func TestTransaction_awaitDone_byContext(t *testing.T) {
 	db, dbmock := test.NewDBMock()
 	dbmock.ExpectBegin()
 	dbmock.ExpectClose()
-	t.Cleanup(func() {
+	test.Cleanup(t, func() {
 		require.NoError(t, db.Close())
 	})
 
@@ -269,7 +269,7 @@ func TestTransaction_awaitDone_byRollback(t *testing.T) {
 	dbmock.ExpectBegin()
 	dbmock.ExpectRollback()
 	dbmock.ExpectClose()
-	t.Cleanup(func() {
+	test.Cleanup(t, func() {
 		_ = db.Close()
 	})