upstream/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2026-05-28 04:10:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Don't override MaxWait, its default is good for CI (#9478)

Browse source
This commit is contained in:
ncabatoff 2020-07-14 14:21:37 -04:00 committed by GitHub
parent 86c5d39c31
commit c68ab7bfaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
builtin/logical/ssh/backend_test.go
View file

@ -19,8 +19,8 @@ import (
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/helper/testhelpers/docker"
"github.com/hashicorp/vault/sdk/logical"
logicaltest "github.com/hashicorp/vault/helper/testhelpers/logical"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/vault"
"github.com/mitchellh/mapstructure"
"github.com/ory/dockertest"
@ -149,7 +149,6 @@ func prepareTestContainer(t *testing.T, tag, caPublicKeyPEM string) (func(), str
sshAddress := fmt.Sprintf("127.0.0.1:%s", resource.GetPort("2222/tcp"))
// exponential backoff-retry
pool.MaxWait = 10 * time.Second
if err = pool.Retry(func() error {
// Install util-linux for non-busybox flock that supports timeout option
return testSSH(t, "vaultssh", sshAddress, ssh.PublicKeys(signer), fmt.Sprintf(`