Refactor integration test (#66)

Co-authored-by: James Kwon <[email protected]>
Comfy-Org · Jul 9, 2024 · 69a3bf1 · 69a3bf1
1 parent e4671e2
commit 69a3bf1
Show file tree

Hide file tree

Showing 4 changed files with 692 additions and 792 deletions.
diff --git a/integration-tests/ban_test.go b/integration-tests/ban_test.go
@@ -14,21 +14,15 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/labstack/echo/v4"
-	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 )
 
 func TestBan(t *testing.T) {
 	clientCtx := context.Background()
-	client, postgresContainer := setupDB(t, clientCtx)
-	// Cleanup
-	defer func() {
-		if err := postgresContainer.Terminate(clientCtx); err != nil {
-			log.Ctx(clientCtx).Error().Msgf("failed to terminate container: %s", err)
-		}
-	}()
+	client, cleanup := setupDB(t, clientCtx)
+	defer cleanup()
 
 	// Initialize the Service
 	mockStorageService := new(gateways.MockStorageService)

diff --git a/integration-tests/ci_cd_integration_test.go b/integration-tests/ci_cd_integration_test.go
@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/rs/zerolog/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -21,13 +20,8 @@ import (
 
 func TestCICD(t *testing.T) {
 	clientCtx := context.Background()
-	client, postgresContainer := setupDB(t, clientCtx)
-	// Cleanup
-	defer func() {
-		if err := postgresContainer.Terminate(clientCtx); err != nil {
-			log.Ctx(clientCtx).Error().Msgf("failed to terminate container: %s", err)
-		}
-	}()
+	client, cleanup := setupDB(t, clientCtx)
+	defer cleanup()
 
 	// Initialize the Service
 	mockStorageService := new(gateways.MockStorageService)