Pushing test db cleanup up to where the database objects are created using t.Cleanup. (#166)

This commit is contained in:
Todd Knight authored and GitHub committed 2020-07-06 10:15:01 -07:00
1 parent 316b250a24
commit bb4a185412
25 files changed
+110 -793

No files matched your search

+5 -50
View File
@@ -17,17 +17,7 @@ import (
)
func TestRepository_New(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := conn.Close(); err != nil {
t.Error(err)
}
if err := cleanup(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
rw := db.New(conn)
wrapper := db.TestWrapper(t)
@@ -115,15 +105,7 @@ func TestRepository_New(t *testing.T) {
}
func TestRepository_CreateCatalog(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
rw := db.New(conn)
wrapper := db.TestWrapper(t)
@@ -282,16 +264,7 @@ func assertPublicId(t *testing.T, prefix, actual string) {
}
func TestRepository_UpdateCatalog(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
rw := db.New(conn)
wrapper := db.TestWrapper(t)
@@ -674,16 +647,7 @@ func TestRepository_UpdateCatalog(t *testing.T) {
}
func TestRepository_LookupCatalog(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
cat := testCatalog(t, conn)
badId, err := newHostCatalogId()
assert.NoError(t, err)
@@ -743,16 +707,7 @@ func TestRepository_LookupCatalog(t *testing.T) {
}
func TestRepository_DeleteCatalog(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
cat := testCatalog(t, conn)
badId, err := newHostCatalogId()
assert.NoError(t, err)
+4 -37
View File
@@ -13,16 +13,7 @@ import (
)
func TestHostCatalog_New(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
_, prj := iam.TestScopes(t, conn)
type args struct {
@@ -145,15 +136,7 @@ func testCatalog(t *testing.T, conn *gorm.DB) *HostCatalog {
}
func TestHost_New(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
cat := testCatalog(t, conn)
conn.LogMode(false)
@@ -296,15 +279,7 @@ func TestHost_New(t *testing.T) {
}
func TestHostSet_New(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
cat := testCatalog(t, conn)
conn.LogMode(false)
@@ -445,15 +420,7 @@ func testSets(t *testing.T, conn *gorm.DB, catalogId string, count int) []*HostS
}
func TestHostSetMember_New(t *testing.T) {
cleanup, conn, _ := db.TestSetup(t, "postgres")
defer func() {
if err := cleanup(); err != nil {
t.Error(err)
}
if err := conn.Close(); err != nil {
t.Error(err)
}
}()
conn, _ := db.TestSetup(t, "postgres")
conn.LogMode(false)
cats := testCatalogs(t, conn, 2)