From 13de05393507d55a7a3313ddb4e454131e40c39b Mon Sep 17 00:00:00 2001 From: Steven Clark Date: Mon, 23 Sep 2024 12:22:11 -0400 Subject: [PATCH] Do not shadown err within MSSQL test container intialization (#28468) - Get better test failure error messages by not shadowing the errors when we are attempting to start the MSSQL docker container, so we can fail the tests with the proper error message that is occuring instead of mssqlhelper.go:60: Could not start docker MSSQL: %!s() --- helper/testhelpers/mssql/mssqlhelper.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helper/testhelpers/mssql/mssqlhelper.go b/helper/testhelpers/mssql/mssqlhelper.go index 94b34a4f3d..71d867de26 100644 --- 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, "" }