From 9eb9b50c0aef5206560e78987706b886fc9af65a Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Wed, 26 Jan 2022 20:16:26 +0100 Subject: [PATCH] Close database after all tests --- activityPub_test.go | 1 + authentication_test.go | 1 + blogroll_test.go | 1 + blogstats_test.go | 1 + captcha_test.go | 1 + comments_test.go | 1 + contact_test.go | 1 + editor_test.go | 1 + errors_test.go | 1 + export_test.go | 1 + feeds_test.go | 1 + geoTrack_test.go | 1 + indexnow_test.go | 1 + indieAuthServer_test.go | 1 + indieAuth_test.go | 1 + ntfy_test.go | 1 + postsDb_test.go | 4 ++++ postsDeleter_test.go | 1 + postsScheduler_test.go | 1 + posts_test.go | 2 ++ privateMode_test.go | 1 + queue_test.go | 1 + shortPath_test.go | 1 + sitemap_test.go | 1 + telegram_test.go | 2 ++ ui_test.go | 4 ++++ webmentionVerification_test.go | 3 +++ webmention_test.go | 1 + 28 files changed, 38 insertions(+) diff --git a/activityPub_test.go b/activityPub_test.go index c4121a0..91d44c2 100644 --- a/activityPub_test.go +++ b/activityPub_test.go @@ -20,6 +20,7 @@ func Test_loadActivityPubPrivateKey(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() // Generate err := app.loadActivityPubPrivateKey() diff --git a/authentication_test.go b/authentication_test.go index 2e26f11..7fec897 100644 --- a/authentication_test.go +++ b/authentication_test.go @@ -31,6 +31,7 @@ func Test_authMiddleware(t *testing.T) { _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d = http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { diff --git a/blogroll_test.go b/blogroll_test.go index 354fc58..a45af63 100644 --- a/blogroll_test.go +++ b/blogroll_test.go @@ -43,6 +43,7 @@ func Test_blogroll(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) fc.setFakeResponse(200, ` diff --git a/blogstats_test.go b/blogstats_test.go index 3cd36a1..974a914 100644 --- a/blogstats_test.go +++ b/blogstats_test.go @@ -43,6 +43,7 @@ func Test_blogStats(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) // Insert post diff --git a/captcha_test.go b/captcha_test.go index 25d68a5..f1ae547 100644 --- a/captcha_test.go +++ b/captcha_test.go @@ -25,6 +25,7 @@ func Test_captchaMiddleware(t *testing.T) { _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d = alice.New(app.checkIsCaptcha, app.captchaMiddleware).ThenFunc(func(rw http.ResponseWriter, r *http.Request) { diff --git a/comments_test.go b/comments_test.go index 4729567..3814888 100644 --- a/comments_test.go +++ b/comments_test.go @@ -37,6 +37,7 @@ func Test_comments(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) t.Run("Successful comment", func(t *testing.T) { diff --git a/contact_test.go b/contact_test.go index 7d2356e..1735140 100644 --- a/contact_test.go +++ b/contact_test.go @@ -52,6 +52,7 @@ func Test_contact(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) // Make contact form request diff --git a/editor_test.go b/editor_test.go index ff4d8b4..d8ed9d3 100644 --- a/editor_test.go +++ b/editor_test.go @@ -17,6 +17,7 @@ func Test_editorPreview(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) h := http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { diff --git a/errors_test.go b/errors_test.go index 257667f..52863c1 100644 --- a/errors_test.go +++ b/errors_test.go @@ -31,6 +31,7 @@ func Test_errors(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) t.Run("Test 404, no HTML", func(t *testing.T) { diff --git a/export_test.go b/export_test.go index 1ba7ace..46dc1f1 100644 --- a/export_test.go +++ b/export_test.go @@ -18,6 +18,7 @@ func Test_export(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() app.initMarkdown() err := app.db.savePost(&post{ diff --git a/feeds_test.go b/feeds_test.go index e4ddaaf..dfd7cc9 100644 --- a/feeds_test.go +++ b/feeds_test.go @@ -17,6 +17,7 @@ func Test_feeds(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d, _ = app.buildRouter() handlerClient := newHandlerClient(app.d) diff --git a/geoTrack_test.go b/geoTrack_test.go index 69c4b22..7b60752 100644 --- a/geoTrack_test.go +++ b/geoTrack_test.go @@ -28,6 +28,7 @@ func Test_geoTrack(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) // First test (just with track) diff --git a/indexnow_test.go b/indexnow_test.go index 307cad2..f88f49b 100644 --- a/indexnow_test.go +++ b/indexnow_test.go @@ -20,6 +20,7 @@ func Test_indexNow(t *testing.T) { app.cfg.IndexNow = &configIndexNow{Enabled: true} _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) // Create http router diff --git a/indieAuthServer_test.go b/indieAuthServer_test.go index 99e6d0f..6e793b9 100644 --- a/indieAuthServer_test.go +++ b/indieAuthServer_test.go @@ -49,6 +49,7 @@ func Test_indieAuthServer(t *testing.T) { require.NoError(t, err) _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.ias.Client = newHandlerClient(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/indieAuth_test.go b/indieAuth_test.go index fc9d704..c78ee92 100644 --- a/indieAuth_test.go +++ b/indieAuth_test.go @@ -30,6 +30,7 @@ func Test_checkIndieAuth(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) req := httptest.NewRequest(http.MethodGet, "/", nil) diff --git a/ntfy_test.go b/ntfy_test.go index 7b3f17d..f3a6603 100644 --- a/ntfy_test.go +++ b/ntfy_test.go @@ -26,6 +26,7 @@ func Test_ntfySending(t *testing.T) { _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.sendNotification("Test notification") diff --git a/postsDb_test.go b/postsDb_test.go index a792d96..82c2b11 100644 --- a/postsDb_test.go +++ b/postsDb_test.go @@ -26,6 +26,7 @@ func Test_postsDb(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) now := toLocalSafe(time.Now().String()) @@ -234,6 +235,7 @@ func Test_ftsWithoutTitle(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() app.initMarkdown() err := app.db.savePost(&post{ @@ -265,6 +267,7 @@ func Test_postsPriority(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() app.initMarkdown() err := app.db.savePost(&post{ @@ -315,6 +318,7 @@ func Test_usesOfMediaFile(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() err := app.db.savePost(&post{ Path: "/test/abc", diff --git a/postsDeleter_test.go b/postsDeleter_test.go index 47b0af7..4206490 100644 --- a/postsDeleter_test.go +++ b/postsDeleter_test.go @@ -13,6 +13,7 @@ func Test_checkDeletedPosts(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) // Create a post diff --git a/postsScheduler_test.go b/postsScheduler_test.go index d11db43..492eb2e 100644 --- a/postsScheduler_test.go +++ b/postsScheduler_test.go @@ -33,6 +33,7 @@ func Test_postsScheduler(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) err := app.db.savePost(&post{ diff --git a/posts_test.go b/posts_test.go index 8def9b9..53fb871 100644 --- a/posts_test.go +++ b/posts_test.go @@ -18,6 +18,7 @@ func Test_serveDate(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d, err = app.buildRouter() @@ -108,6 +109,7 @@ func Test_servePost(t *testing.T) { }) _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d, err = app.buildRouter() diff --git a/privateMode_test.go b/privateMode_test.go index 4b3c5a6..ef4e73c 100644 --- a/privateMode_test.go +++ b/privateMode_test.go @@ -46,6 +46,7 @@ func Test_privateMode(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) handler := alice.New(middleware.WithValue(blogKey, "en"), app.privateModeHandler).ThenFunc(func(rw http.ResponseWriter, r *http.Request) { diff --git a/queue_test.go b/queue_test.go index 1f5cb00..7c06304 100644 --- a/queue_test.go +++ b/queue_test.go @@ -18,6 +18,7 @@ func Test_queue(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() db := app.db err := db.enqueue("test", []byte(""), time.Now()) diff --git a/shortPath_test.go b/shortPath_test.go index 9b6652f..814bb2e 100644 --- a/shortPath_test.go +++ b/shortPath_test.go @@ -17,6 +17,7 @@ func Test_shortenPath(t *testing.T) { }, } _ = app.initDatabase(false) + defer app.db.close() db := app.db res1, err := db.shortenPath("/a") diff --git a/sitemap_test.go b/sitemap_test.go index abb44d8..a65ec7e 100644 --- a/sitemap_test.go +++ b/sitemap_test.go @@ -18,6 +18,7 @@ func Test_sitemap(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d, err = app.buildRouter() diff --git a/telegram_test.go b/telegram_test.go index 5222af3..7bf7928 100644 --- a/telegram_test.go +++ b/telegram_test.go @@ -124,6 +124,7 @@ func Test_telegram(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initMarkdown() app.initTelegram() @@ -157,6 +158,7 @@ func Test_telegram(t *testing.T) { _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initTelegram() diff --git a/ui_test.go b/ui_test.go index 344f2a6..5218dc9 100644 --- a/ui_test.go +++ b/ui_test.go @@ -21,6 +21,7 @@ func Test_renderPostTax(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) p := &post{ @@ -47,6 +48,7 @@ func Test_renderOldContentWarning(t *testing.T) { } _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) p := &post{ @@ -74,6 +76,7 @@ func Test_renderInteractions(t *testing.T) { app.cfg.Server.PublicAddress = "https://example.com" _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) app.d, err = app.buildRouter() require.NoError(t, err) @@ -140,6 +143,7 @@ func Test_renderAuthor(t *testing.T) { app.cfg.User.Name = "John Doe" _ = app.initConfig() _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) buf := &bytes.Buffer{} diff --git a/webmentionVerification_test.go b/webmentionVerification_test.go index 1709f2b..21383d3 100644 --- a/webmentionVerification_test.go +++ b/webmentionVerification_test.go @@ -37,6 +37,7 @@ func Test_verifyMention(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) m := &mention{ @@ -84,6 +85,7 @@ func Test_verifyMentionBidgy(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) m := &mention{ @@ -127,6 +129,7 @@ func Test_verifyMentionColin(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) m := &mention{ diff --git a/webmention_test.go b/webmention_test.go index 9490feb..35fc3b6 100644 --- a/webmention_test.go +++ b/webmention_test.go @@ -29,6 +29,7 @@ func Test_webmentions(t *testing.T) { } _ = app.initDatabase(false) + defer app.db.close() app.initComponents(false) _ = app.db.insertWebmention(&mention{