From 8d7f24268caa08412f0c19fa5b2dff37d5b725c1 Mon Sep 17 00:00:00 2001 From: Michael Gaffney Date: Tue, 12 May 2020 15:49:37 -0400 Subject: [PATCH] Return url of test database (#48) It is helpful to connect to a database when tests have failed. --- internal/db/domains_test.go | 2 +- internal/db/read_writer_test.go | 20 ++++++++++---------- internal/db/testing.go | 4 ++-- internal/db/testing_test.go | 2 +- internal/iam/repository_scope_test.go | 6 +++--- internal/iam/repository_test.go | 6 +++--- internal/iam/scope_test.go | 10 +++++----- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/db/domains_test.go b/internal/db/domains_test.go index 014de9e6e8..f08df92fd2 100644 --- a/internal/db/domains_test.go +++ b/internal/db/domains_test.go @@ -21,7 +21,7 @@ returning id; ` ) - cleanup, conn := TestSetup(t, "postgres") + cleanup, conn, _ := TestSetup(t, "postgres") defer cleanup() defer conn.Close() diff --git a/internal/db/read_writer_test.go b/internal/db/read_writer_test.go index 5df5581afa..e604f69b51 100644 --- a/internal/db/read_writer_test.go +++ b/internal/db/read_writer_test.go @@ -14,7 +14,7 @@ import ( func TestDb_Update(t *testing.T) { // intentionally not run with t.Parallel so we don't need to use DoTx for the Update tests - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -167,7 +167,7 @@ func TestDb_Update(t *testing.T) { func TestDb_Create(t *testing.T) { // intentionally not run with t.Parallel so we don't need to use DoTx for the Create tests - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -275,7 +275,7 @@ func TestDb_Create(t *testing.T) { func TestDb_LookupByName(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -330,7 +330,7 @@ func TestDb_LookupByName(t *testing.T) { func TestDb_LookupByPublicId(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -385,7 +385,7 @@ func TestDb_LookupByPublicId(t *testing.T) { func TestDb_LookupWhere(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -435,7 +435,7 @@ func TestDb_LookupWhere(t *testing.T) { func TestDb_SearchWhere(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -485,7 +485,7 @@ func TestDb_SearchWhere(t *testing.T) { func TestDb_DB(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -508,7 +508,7 @@ func TestDb_DB(t *testing.T) { func TestDb_DoTx(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -608,7 +608,7 @@ func TestDb_DoTx(t *testing.T) { func TestDb_Delete(t *testing.T) { // intentionally not run with t.Parallel so we don't need to use DoTx for the Create tests - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() @@ -789,7 +789,7 @@ func TestDb_Delete(t *testing.T) { func TestDb_ScanRows(t *testing.T) { t.Parallel() - cleanup, db := TestSetup(t, "postgres") + cleanup, db, _ := TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer db.Close() diff --git a/internal/db/testing.go b/internal/db/testing.go index 6b7af4c216..7f74638a9f 100644 --- a/internal/db/testing.go +++ b/internal/db/testing.go @@ -12,7 +12,7 @@ import ( ) // setup the tests (initialize the database one-time and intialized testDatabaseURL) -func TestSetup(t *testing.T, dialect string) (func() error, *gorm.DB) { +func TestSetup(t *testing.T, dialect string) (func() error, *gorm.DB, string) { cleanup := func() error { return nil } var url string var err error @@ -24,7 +24,7 @@ func TestSetup(t *testing.T, dialect string) (func() error, *gorm.DB) { if err != nil { t.Fatal(err) } - return cleanup, db + return cleanup, db, url } // TestWrapper initializes an AEAD wrapping.Wrapper for testing the oplog diff --git a/internal/db/testing_test.go b/internal/db/testing_test.go index 03b1833711..57e897f465 100644 --- a/internal/db/testing_test.go +++ b/internal/db/testing_test.go @@ -6,7 +6,7 @@ import ( func Test_Utils(t *testing.T) { t.Parallel() - cleanup, conn := TestSetup(t, "postgres") + cleanup, conn, _ := TestSetup(t, "postgres") defer cleanup() defer conn.Close() t.Run("nothing", func(t *testing.T) { diff --git a/internal/iam/repository_scope_test.go b/internal/iam/repository_scope_test.go index 01f04bd601..ca4a2afb95 100644 --- a/internal/iam/repository_scope_test.go +++ b/internal/iam/repository_scope_test.go @@ -13,7 +13,7 @@ import ( func Test_Repository_CreateScope(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -52,7 +52,7 @@ func Test_Repository_CreateScope(t *testing.T) { func Test_Repository_UpdateScope(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -138,7 +138,7 @@ func Test_Repository_UpdateScope(t *testing.T) { func Test_Repository_LookupScope(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() diff --git a/internal/iam/repository_test.go b/internal/iam/repository_test.go index 410e7f4fdc..17bdf13396 100644 --- a/internal/iam/repository_test.go +++ b/internal/iam/repository_test.go @@ -15,7 +15,7 @@ import ( func TestNewRepository(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -100,7 +100,7 @@ func TestNewRepository(t *testing.T) { } func Test_Repository_create(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -149,7 +149,7 @@ func Test_Repository_create(t *testing.T) { func Test_dbRepository_update(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() diff --git a/internal/iam/scope_test.go b/internal/iam/scope_test.go index c809fac896..04255b2140 100644 --- a/internal/iam/scope_test.go +++ b/internal/iam/scope_test.go @@ -12,7 +12,7 @@ import ( func Test_NewScope(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -49,7 +49,7 @@ func Test_NewScope(t *testing.T) { } func Test_ScopeCreate(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -89,7 +89,7 @@ func Test_ScopeCreate(t *testing.T) { func Test_ScopeUpdate(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -127,7 +127,7 @@ func Test_ScopeUpdate(t *testing.T) { } func Test_ScopeGetScope(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close() @@ -178,7 +178,7 @@ func TestScope_ResourceType(t *testing.T) { func TestScope_Clone(t *testing.T) { t.Parallel() - cleanup, conn := db.TestSetup(t, "postgres") + cleanup, conn, _ := db.TestSetup(t, "postgres") defer cleanup() assert := assert.New(t) defer conn.Close()