From c177e59b38db9575731be5414f02bc16b80e88a5 Mon Sep 17 00:00:00 2001 From: Jonathan Chappelow Date: Fri, 6 Dec 2024 15:29:47 -0600 Subject: [PATCH] update cleanup in node_live_test.go too --- node/node_live_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/node/node_live_test.go b/node/node_live_test.go index c79f974ab..bec904e39 100644 --- a/node/node_live_test.go +++ b/node/node_live_test.go @@ -41,6 +41,11 @@ var defaultGenesisParams = &consensus.GenesisParams{ }, } +func TestMain(m *testing.M) { + pg.UseLogger(log.New(log.WithName("DBS"))) + m.Run() +} + func TestSingleNodeMocknet(t *testing.T) { if testing.Short() { t.Skip() @@ -54,8 +59,6 @@ func TestSingleNodeMocknet(t *testing.T) { bs1 := memstore.NewMemBS() mp1 := mempool.New() - pg.UseLogger(log.New(log.WithName("DBS"))) - db1 := initDB(t, "5432", "kwil_test_db") root1 := t.TempDir() @@ -155,8 +158,6 @@ func TestDualNodeMocknet(t *testing.T) { bs1 := memstore.NewMemBS() mp1 := mempool.New() - pg.UseLogger(log.New(log.WithName("DBS"))) - db1 := initDB(t, "5432", "kwil_test_db") func() { ctx := context.Background() @@ -332,10 +333,9 @@ func initDB(t *testing.T, port, dbName string) *pg.DB { } func cleanupDB(db *pg.DB) { - ctx := context.Background() - db.AutoCommit(true) - defer db.AutoCommit(false) defer db.Close() + db.AutoCommit(true) + ctx := context.Background() db.Execute(ctx, `DROP SCHEMA IF EXISTS kwild_chain CASCADE;`) db.Execute(ctx, `DROP SCHEMA IF EXISTS kwild_internal CASCADE;`) }