Merge 13de053 into backport/stevendpclark/better-logging-mssql-tests/…

…eminently-present-snail
hashicorp · Sep 23, 2024 · 20f783f · 20f783f
2 parents 683fd73 + 13de053
commit 20f783f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/helper/testhelpers/mssql/mssqlhelper.go b/helper/testhelpers/mssql/mssqlhelper.go
@@ -35,7 +35,8 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) {
 	var err error
 	for i := 0; i < numRetries; i++ {
 		var svc *docker.Service
-		runner, err := docker.NewServiceRunner(docker.RunOptions{
+		var runner *docker.Runner
+		runner, err = docker.NewServiceRunner(docker.RunOptions{
 			ContainerName: "sqlserver",
 			ImageRepo:     "mcr.microsoft.com/mssql/server",
 			ImageTag:      "2017-latest-ubuntu",
@@ -48,7 +49,8 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) {
 			},
 		})
 		if err != nil {
-			t.Fatalf("Could not start docker MSSQL: %s", err)
+			t.Logf("Could not start docker MSSQL: %v", err)
+			continue
 		}
 
 		svc, err = runner.StartService(context.Background(), connectMSSQL)
@@ -57,7 +59,7 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) {
 		}
 	}
 
-	t.Fatalf("Could not start docker MSSQL: %s", err)
+	t.Fatalf("Could not start docker MSSQL: %v", err)
 	return nil, ""
 }