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

Clean up container on connection failure, switch to ory/dockertest on package postgresql (#5050)

Browse Source
This commit is contained in:
Calvin Leung Huang
2018-08-07 09:56:33 -07:00
committed by Brian Kassouf
parent 6977aa70f1
commit ece7569aca
6 changed files with 58 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/api_integration_test.go
View File

@@ -145,6 +145,12 @@ func testPostgresDB(t testing.TB) (string, func()) {
t.Fatalf("postgresdb: could not start container: %s", err)
}
cleanup := func() {
if err := pool.Purge(resource); err != nil {
t.Fatalf("failed to cleanup local container: %s", err)
}
}
addr := fmt.Sprintf("postgres://postgres:secret@localhost:%s/database?sslmode=disable", resource.GetPort("5432/tcp"))
if err := pool.Retry(func() error {
@@ -155,12 +161,9 @@ func testPostgresDB(t testing.TB) (string, func()) {
defer db.Close()
return db.Ping()
}); err != nil {
cleanup()
t.Fatalf("postgresdb: could not connect: %s", err)
}
return addr, func() {
if err := pool.Purge(resource); err != nil {
t.Fatalf("postgresdb: failed to cleanup container: %s", err)
}
}
return addr, cleanup
}