From 066dabe2d8ced9827365efc59af7cfbd8d18cf76 Mon Sep 17 00:00:00 2001 From: Miguel Martinez Trivino Date: Thu, 9 Mar 2023 10:44:57 +0100 Subject: [PATCH] fix(tests): vault healthcheck improvements Signed-off-by: Miguel Martinez Trivino --- internal/credentials/vault/keyval_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/credentials/vault/keyval_test.go b/internal/credentials/vault/keyval_test.go index 3b5979b7c..42d680228 100644 --- a/internal/credentials/vault/keyval_test.go +++ b/internal/credentials/vault/keyval_test.go @@ -203,7 +203,7 @@ func newVaultInstance(t *testing.T) *vaultInstance { Env: map[string]string{ "VAULT_DEV_ROOT_TOKEN_ID": defaultToken, }, - WaitingFor: wait.ForListeningPort("8200/tcp"), + WaitingFor: wait.ForHTTP("/v1/sys/health").WithPort("8200/tcp"), } instance, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{ @@ -211,8 +211,7 @@ func newVaultInstance(t *testing.T) *vaultInstance { Started: true, }) - assert.NoError(t, err) - + require.NoError(t, err) return &vaultInstance{instance} } @@ -242,9 +241,7 @@ func (s *testSuite) SetupTest() { } func (s *testSuite) TearDownTest() { - ctx, cancel := context.WithTimeout(context.Background(), time.Minute) - defer cancel() - assert.NoError(s.T(), s.vault.instance.Terminate(ctx)) + assert.NoError(s.T(), s.vault.instance.Terminate(context.Background())) } // Run the tests