failfast

mittwald · Feb 14, 2025 · c06a009 · c06a009
1 parent bb6ff9a
commit c06a009
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 26 deletions.
diff --git a/test/pkg/source/internal/testcommons.go b/test/pkg/source/internal/testcommons.go
@@ -3,6 +3,7 @@ package internal
 import (
 	"context"
 	"fmt"
+	"io"
 	"os"
 	"os/exec"
 	"strings"
@@ -24,6 +25,25 @@ type TestContainerSetup struct {
 	Port      string
 }
 
+func (t *TestContainerSetup) PrintLogs() {
+	reader, _ := t.Container.Logs(context.Background())
+
+	fmt.Printf("\n\n##### START CONTAINER LOGS #####\n\n")
+
+	buf := make([]byte, 4096)
+	for {
+		n, readErr := reader.Read(buf)
+		if readErr != nil {
+			if readErr == io.EOF {
+				break
+			}
+		}
+		fmt.Print(string(buf[:n]))
+	}
+
+	fmt.Printf("\n\n##### END CONTAINER LOGS #####\n\n")
+}
+
 // ResticReq is a testcontainers request for a restic container
 var ResticReq = testcontainers.ContainerRequest{
 	Image:        "restic/rest-server:latest",
@@ -37,10 +57,12 @@ var ResticReq = testcontainers.ContainerRequest{
 // NewTestContainerSetup creates a TestContainerSetup which acts as a wrapper for the testcontainer specified by request
 func NewTestContainerSetup(ctx context.Context, request *testcontainers.ContainerRequest, port nat.Port) (TestContainerSetup, error) {
 	result := TestContainerSetup{}
-	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		ContainerRequest: *request,
-		Started:          true,
-	})
+	container, err := testcontainers.GenericContainer(
+		ctx, testcontainers.GenericContainerRequest{
+			ContainerRequest: *request,
+			Started:          true,
+		},
+	)
 	if err != nil {
 		return TestContainerSetup{}, err
 	}
@@ -70,10 +92,14 @@ func TestSetup() {
 
 // DoResticRestore pulls the given backup from the given restic repo
 func DoResticRestore(ctx context.Context, resticContainer TestContainerSetup, dataDir string) error {
-	cmd := exec.CommandContext(ctx, "restic", "restore", "-r", // nolint: gosec
-		fmt.Sprintf("rest:http://%s:%s/",
-			resticContainer.Address, resticContainer.Port),
-		"--target", dataDir, "latest")
+	cmd := exec.CommandContext(
+		ctx, "restic", "restore", "-r", // nolint: gosec
+		fmt.Sprintf(
+			"rest:http://%s:%s/",
+			resticContainer.Address, resticContainer.Port,
+		),
+		"--target", dataDir, "latest",
+	)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return errors.Errorf("failed to execute restic restore: \n Output: %s \n Error: %s", out, err)

diff --git a/test/pkg/source/mysqltest/mysql_test.go b/test/pkg/source/mysqltest/mysql_test.go
@@ -5,7 +5,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"io"
 	"os"
 	"reflect"
 	"testing"
@@ -286,23 +285,7 @@ func mySQLDoRestore(
 	}
 
 	defer func() {
-		reader, _ := mySQLRestoreTarget.Container.Logs(context.Background())
-
-		fmt.Printf("\n\n##### START SQL CONTAINER LOGS #####\n\n")
-
-		buf := make([]byte, 4096)
-		for {
-			n, readErr := reader.Read(buf)
-			if readErr != nil {
-				if readErr == io.EOF {
-					break
-				}
-				log.Fatalf("Error reading logs: %v", err)
-			}
-			fmt.Print(string(buf[:n]))
-		}
-
-		fmt.Printf("\n\n##### END SQL CONTAINER LOGS #####\n\n")
+		mySQLRestoreTarget.PrintLogs()
 
 		restoreErr := mySQLRestoreTarget.Container.Terminate(ctx)
 		if restoreErr != nil {