chore: use require.(No)Error(t,err) instead of t.Fatal(err) (#2851)

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
testcontainers · Oct 28, 2024 · b7511cd · b7511cd
1 parent 7ca3d8e
commit b7511cd
Show file tree

Hide file tree

Showing 20 changed files with 150 additions and 405 deletions.
diff --git a/container_file_test.go b/container_file_test.go
@@ -7,6 +7,8 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestContainerFileValidation(t *testing.T) {
@@ -17,9 +19,7 @@ func TestContainerFileValidation(t *testing.T) {
 	}
 
 	f, err := os.Open(filepath.Join(".", "testdata", "hello.sh"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	testTable := []ContainerFileValidationTestCase{
 		{

diff --git a/docker_files_test.go b/docker_files_test.go
@@ -21,14 +21,10 @@ func TestCopyFileToContainer(t *testing.T) {
 
 	// copyFileOnCreate {
 	absPath, err := filepath.Abs(filepath.Join(".", "testdata", "hello.sh"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	r, err := os.Open(absPath)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	ctr, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
@@ -58,13 +54,9 @@ func TestCopyFileToRunningContainer(t *testing.T) {
 	// Not using the assertations here to avoid leaking the library into the example
 	// copyFileAfterCreate {
 	waitForPath, err := filepath.Abs(filepath.Join(".", "testdata", "waitForHello.sh"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	helloPath, err := filepath.Abs(filepath.Join(".", "testdata", "hello.sh"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	ctr, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
@@ -100,9 +92,7 @@ func TestCopyDirectoryToContainer(t *testing.T) {
 	// Not using the assertations here to avoid leaking the library into the example
 	// copyDirectoryToContainer {
 	dataDirectory, err := filepath.Abs(filepath.Join(".", "testdata"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	ctr, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
@@ -133,13 +123,9 @@ func TestCopyDirectoryToRunningContainerAsFile(t *testing.T) {
 
 	// copyDirectoryToRunningContainerAsFile {
 	dataDirectory, err := filepath.Abs(filepath.Join(".", "testdata"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	waitForPath, err := filepath.Abs(filepath.Join(dataDirectory, "waitForHello.sh"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	ctr, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{
@@ -175,13 +161,9 @@ func TestCopyDirectoryToRunningContainerAsDir(t *testing.T) {
 	// Not using the assertations here to avoid leaking the library into the example
 	// copyDirectoryToRunningContainerAsDir {
 	waitForPath, err := filepath.Abs(filepath.Join(".", "testdata", "waitForHello.sh"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 	dataDirectory, err := filepath.Abs(filepath.Join(".", "testdata"))
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	ctr, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: testcontainers.ContainerRequest{