From c002466e5f7a49840405a51a93e9e64c0dd2a178 Mon Sep 17 00:00:00 2001 From: Steven Clark Date: Mon, 23 Sep 2024 12:39:11 -0400 Subject: [PATCH 1/2] Add a core test logger to help capture the MSSQL container output - I believe the if t.Failed prevents the logging of the container logging as when executed the test isn't considered failed yet. - Use a test core logger so that we can capture the container output all the time and get it from the captured log files when the test fails --- helper/testhelpers/mssql/mssqlhelper.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/helper/testhelpers/mssql/mssqlhelper.go b/helper/testhelpers/mssql/mssqlhelper.go index 71d867de260d..08e8d566fa95 100644 --- a/helper/testhelpers/mssql/mssqlhelper.go +++ b/helper/testhelpers/mssql/mssqlhelper.go @@ -13,6 +13,7 @@ import ( "strings" "testing" + "github.com/hashicorp/vault/helper/testhelpers/corehelpers" "github.com/hashicorp/vault/sdk/helper/docker" ) @@ -32,6 +33,8 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) { return func() {}, os.Getenv("MSSQL_URL") } + logger := corehelpers.NewTestLogger(t) + var err error for i := 0; i < numRetries; i++ { var svc *docker.Service @@ -43,13 +46,11 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) { Env: []string{"ACCEPT_EULA=Y", "SA_PASSWORD=" + mssqlPassword}, Ports: []string{"1433/tcp"}, LogConsumer: func(s string) { - if t.Failed() { - t.Logf("container logs: %s", s) - } + logger.Info(s) }, }) if err != nil { - t.Logf("Could not start docker MSSQL: %v", err) + logger.Error("failed creating new service runner", "error", err.Error()) continue } @@ -57,9 +58,11 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) { if err == nil { return svc.Cleanup, svc.Config.URL().String() } + + logger.Error("failed starting service", "error", err.Error()) } - t.Fatalf("Could not start docker MSSQL: %v", err) + t.Fatalf("Could not start docker MSSQL last error: %v", err) return nil, "" } From ccbc1ff08f2ff12264416bd2f740d7343addab9b Mon Sep 17 00:00:00 2001 From: JM Faircloth Date: Mon, 23 Sep 2024 12:36:55 -0500 Subject: [PATCH 2/2] bump image tag to 2022-latest --- helper/testhelpers/mssql/mssqlhelper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/testhelpers/mssql/mssqlhelper.go b/helper/testhelpers/mssql/mssqlhelper.go index 08e8d566fa95..154caf259843 100644 --- a/helper/testhelpers/mssql/mssqlhelper.go +++ b/helper/testhelpers/mssql/mssqlhelper.go @@ -42,7 +42,7 @@ func PrepareMSSQLTestContainer(t *testing.T) (cleanup func(), retURL string) { runner, err = docker.NewServiceRunner(docker.RunOptions{ ContainerName: "sqlserver", ImageRepo: "mcr.microsoft.com/mssql/server", - ImageTag: "2017-latest-ubuntu", + ImageTag: "2022-latest", Env: []string{"ACCEPT_EULA=Y", "SA_PASSWORD=" + mssqlPassword}, Ports: []string{"1433/tcp"}, LogConsumer: func(s string) {