scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 11:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

logical/nomad: Reduce flakiness in prepareTestContainer (#5440)

Browse Source
This commit is contained in:
Calvin Leung Huang
2018-10-01 17:46:37 -07:00
committed by Brian Kassouf
parent c628d8b37c
commit cc88369dad
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/logical/nomad/backend_test.go
View File

@@ -48,9 +48,7 @@ func prepareTestContainer(t *testing.T) (cleanup func(), retAddress string, noma
}
retAddress = fmt.Sprintf("http://localhost:%s/", resource.GetPort("4646/tcp"))
// Give Nomad time to initialize
time.Sleep(5000 * time.Millisecond)
// exponential backoff-retry
if err = pool.Retry(func() error {
var err error
@@ -62,7 +60,7 @@ func prepareTestContainer(t *testing.T) (cleanup func(), retAddress string, noma
}
aclbootstrap, _, err := nomad.ACLTokens().Bootstrap(nil)
if err != nil {
t.Fatalf("err: %v", err)
return err
}
nomadToken = aclbootstrap.SecretID
t.Logf("[WARN] Generated Master token: %s", nomadToken)
@@ -94,13 +92,13 @@ func prepareTestContainer(t *testing.T) (cleanup func(), retAddress string, noma
nomadAuth, err := nomadapi.NewClient(nomadAuthConfig)
_, err = nomadAuth.ACLPolicies().Upsert(policy, nil)
if err != nil {
t.Fatal(err)
return err
}
_, err = nomadAuth.ACLPolicies().Upsert(anonPolicy, nil)
if err != nil {
t.Fatal(err)
return err
}
return err
return nil
}); err != nil {
cleanup()
t.Fatalf("Could not connect to docker: %s", err)