From 3af8ff28b88b6e92a01ea5d2d80c4985cc810058 Mon Sep 17 00:00:00 2001
From: kopaygorosky <vlad.kopaygorodsky@gmail.com>
Date: Fri, 12 Jul 2024 04:45:23 +0300
Subject: [PATCH] test

---
 testing/integration/saga/suite/mysqlsuite.go | 12 ++++++++++--
 testing/integration/saga/suite/pgsuite.go    |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/testing/integration/saga/suite/mysqlsuite.go b/testing/integration/saga/suite/mysqlsuite.go
index 37763e8..e739e9f 100644
--- a/testing/integration/saga/suite/mysqlsuite.go
+++ b/testing/integration/saga/suite/mysqlsuite.go
@@ -8,6 +8,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/testcontainers/testcontainers-go"
+	"github.com/testcontainers/testcontainers-go/wait"
+
 	driverSql "github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
@@ -49,6 +52,10 @@ func (t *MysqlSuite) SetupSuite() {
 		mysql.WithDatabase(dbCreds.dbName),
 		mysql.WithUsername(dbCreds.user),
 		mysql.WithPassword(dbCreds.password),
+		testcontainers.WithWaitStrategy(
+			wait.ForLog("[Server] /usr/sbin/mysqld: ready for connections").
+				WithOccurrence(1).
+				WithStartupTimeout(30*time.Second)),
 	)
 	t.Require().NoError(err)
 	t.dbContainer = dbContainer
@@ -64,6 +71,8 @@ func (t *MysqlSuite) SetupSuite() {
 		connectionStr = v
 	}
 
+	time.Sleep(time.Second * 5)
+
 	t.dbConn, err = sql.Open("mysql", connectionStr)
 	require.NoError(t.T(), err)
 	err = t.dbConn.Ping()
@@ -87,8 +96,7 @@ func (t *MysqlSuite) TearDownSuite() {
 	require.NoError(t.T(), t.dbConn.Close())
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()
-	timeout := time.Second * 10
-	err = t.dbContainer.Stop(ctx, &timeout)
+	err = t.dbContainer.Stop(ctx, nil)
 	t.Require().NoError(err)
 }
 
diff --git a/testing/integration/saga/suite/pgsuite.go b/testing/integration/saga/suite/pgsuite.go
index 256098d..19e356f 100644
--- a/testing/integration/saga/suite/pgsuite.go
+++ b/testing/integration/saga/suite/pgsuite.go
@@ -49,7 +49,7 @@ func (t *PgSuite) SetupSuite() {
 		testcontainers.WithWaitStrategy(
 			wait.ForLog("database system is ready to accept connections").
 				WithOccurrence(2).
-				WithStartupTimeout(1*time.Second)),
+				WithStartupTimeout(30*time.Second)),
 	)
 	require.NoError(t.T(), err)
 	t.dbContainer = dbContainer
@@ -64,6 +64,8 @@ func (t *PgSuite) SetupSuite() {
 		connectionStr = v
 	}
 
+	time.Sleep(time.Second * 5)
+
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
 	defer cancel()