From e23e3729e8bccc41f58178eee741394a9c71b4cb Mon Sep 17 00:00:00 2001 From: jholdstock Date: Mon, 27 Jun 2022 09:14:54 +0100 Subject: [PATCH] Helper func for stdout logger. Also reuse the logger in database tests, dont create a new one each time. --- database/database_test.go | 13 +++++++++---- webapi/setaltsignaddr_test.go | 9 +++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/database/database_test.go b/database/database_test.go index d05ed90..b0ee598 100644 --- a/database/database_test.go +++ b/database/database_test.go @@ -59,6 +59,13 @@ func randString(length int, charset string) string { return string(b) } +func stdoutLogger() slog.Logger { + backend := slog.NewBackend(os.Stdout) + log := backend.Logger("test") + log.SetLevel(slog.LevelTrace) + return log +} + // TestDatabase runs all database tests. func TestDatabase(t *testing.T) { // Ensure we are starting with a clean environment. @@ -83,11 +90,9 @@ func TestDatabase(t *testing.T) { "testDeleteAltSignAddr": testDeleteAltSignAddr, } + log := stdoutLogger() + for testName, test := range tests { - // Set test logger to stdout. - backend := slog.NewBackend(os.Stdout) - log := backend.Logger("test") - log.SetLevel(slog.LevelTrace) // Create a new blank database for each sub-test. var err error diff --git a/webapi/setaltsignaddr_test.go b/webapi/setaltsignaddr_test.go index 232134c..98cf6e4 100644 --- a/webapi/setaltsignaddr_test.go +++ b/webapi/setaltsignaddr_test.go @@ -52,11 +52,16 @@ func randBytes(n int) []byte { return slice } -func TestMain(m *testing.M) { - // Set test logger to stdout. +func stdoutLogger() slog.Logger { backend := slog.NewBackend(os.Stdout) log := backend.Logger("test") log.SetLevel(slog.LevelTrace) + return log +} + +func TestMain(m *testing.M) { + + log := stdoutLogger() // Set up some global params. cfg := Config{