From 991fd6c146ea22e6188b4c28e7c6bef7d4bf1a61 Mon Sep 17 00:00:00 2001 From: Zachary Wasserman Date: Tue, 8 Nov 2016 13:46:36 -0800 Subject: [PATCH] Ensure tables are dropped after panic in test (#456) Prior to this, a panic in the test function would leave data in the database. Now we ensure that tables are dropped even after a panic. --- server/datastore/gorm_test.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/datastore/gorm_test.go b/server/datastore/gorm_test.go index 954d8e55c6..bf409827ad 100644 --- a/server/datastore/gorm_test.go +++ b/server/datastore/gorm_test.go @@ -29,6 +29,7 @@ func setupGorm(t *testing.T) (ds kolide.Datastore, teardown func()) { if !ok { panic("expected gormDB datastore") } + require.Nil(t, db.Drop()) db.DB.Close() } return ds, teardown @@ -38,15 +39,11 @@ func TestGorm(t *testing.T) { if _, ok := os.LookupEnv("MYSQL_TEST"); !ok { t.SkipNow() } - ds, teardown := setupGorm(t) - defer teardown() for _, f := range testFunctions { t.Run(functionName(f), func(t *testing.T) { - err := ds.Migrate() - require.Nil(t, err) + ds, teardown := setupGorm(t) + defer teardown() f(t, ds) - err = ds.Drop() - require.Nil(t, err) }) } }