chore: use cleanup function

gofiber · Dec 12, 2024 · cac4fd5 · cac4fd5
1 parent b074e83
commit cac4fd5
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 35 deletions.
diff --git a/clickhouse/clickhouse_test.go b/clickhouse/clickhouse_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/clickhouse"
 )
 
@@ -39,14 +40,10 @@ func getTestConnection(t testing.TB, cfg Config) (*Storage, error) {
 		clickhouse.WithPassword(clickhousePass),
 		clickhouse.WithDatabase(clickhouseDB),
 	)
+	testcontainers.CleanupContainer(t, c)
 	if err != nil {
 		return nil, err
 	}
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	hostPort, err := c.ConnectionHost(ctx)
 	if err != nil {

diff --git a/couchbase/couchbase_test.go b/couchbase/couchbase_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/couchbase"
 )
 
@@ -36,14 +37,10 @@ func newTestStore(t testing.TB) (*Storage, error) {
 		couchbase.WithAdminCredentials(couchbaseUser, couchbasePass),
 		couchbase.WithBuckets(bucket),
 	)
+	testcontainers.CleanupContainer(t, c)
 	if err != nil {
 		return nil, err
 	}
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	conn, err := c.ConnectionString(ctx)
 	if err != nil {

diff --git a/minio/minio_test.go b/minio/minio_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/minio"
 )
 
@@ -34,14 +35,10 @@ func newTestStore(t testing.TB) (*Storage, error) {
 		minio.WithUsername(minioUser),
 		minio.WithPassword(minioPass),
 	)
+	testcontainers.CleanupContainer(t, c)
 	if err != nil {
 		return nil, err
 	}
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	conn, err := c.ConnectionString(ctx)
 	if err != nil {

diff --git a/mongodb/mongodb_test.go b/mongodb/mongodb_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/mongodb"
 )
 
@@ -29,14 +30,10 @@ func newTestStore(t testing.TB) (*Storage, error) {
 	ctx := context.Background()
 
 	c, err := mongodb.Run(ctx, img, mongodb.WithUsername(mongoDBUser), mongodb.WithPassword(mongoDBPass))
+	testcontainers.CleanupContainer(t, c)
 	if err != nil {
 		return nil, err
 	}
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	conn, err := c.ConnectionString(ctx)
 	if err != nil {

diff --git a/mssql/mssql_test.go b/mssql/mssql_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/mssql"
 )
 
@@ -35,14 +36,10 @@ func newTestStore(t testing.TB) (*Storage, error) {
 		mssql.WithPassword(mssqlPass),
 		mssql.WithAcceptEULA(),
 	)
+	testcontainers.CleanupContainer(t, c)
 	if err != nil {
 		return nil, err
 	}
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	conn, err := c.ConnectionString(ctx)
 	if err != nil {

diff --git a/mysql/mysql_test.go b/mysql/mysql_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/modules/mysql"
 )
 
@@ -51,12 +52,8 @@ func mustStartMySQL(t testing.TB) *mysql.MySQLContainer {
 		mysql.WithUsername(mysqlUser),
 		mysql.WithDatabase(mysqlDatabase),
 	)
+	testcontainers.CleanupContainer(t, c)
 	require.NoError(t, err)
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	return c
 }

diff --git a/postgres/postgres_test.go b/postgres/postgres_test.go
@@ -42,12 +42,8 @@ func newTestStore(t testing.TB) (*Storage, error) {
 			wait.ForLog("database system is ready to accept connections").WithOccurrence(2),
 		),
 	)
+	testcontainers.CleanupContainer(t, c)
 	require.NoError(t, err)
-	t.Cleanup(func() {
-		if c != nil {
-			require.NoError(t, c.Terminate(ctx))
-		}
-	})
 
 	conn, err := c.ConnectionString(ctx, "sslmode=disable")
 	if err != nil {