From 2faaa4c5b4bdadbe93b8e034aede57692ab49995 Mon Sep 17 00:00:00 2001 From: limiting-factor Date: Fri, 2 Jan 2026 05:32:32 +0100 Subject: [PATCH] chore: move all test blank imports in a single package (#10662) - Create `modules/testimport/import.go` to centralize blank import needed for tests (in order to run the `init` function) to simplify maintenance. - Remove the imports that are not needed. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/10662 Reviewed-by: Michael Kriese Reviewed-by: Gusted Co-authored-by: limiting-factor Co-committed-by: limiting-factor --- models/activities/main_test.go | 4 ---- models/auth/main_test.go | 7 +------ models/avatars/main_test.go | 4 ---- models/db/main_test.go | 3 --- models/forgejo/semver/main_test.go | 5 ----- models/git/main_test.go | 5 ----- models/issues/main_test.go | 6 ------ models/main_test.go | 4 ---- models/organization/main_test.go | 8 +------- models/packages/debian/search_test.go | 5 ----- models/packages/main_test.go | 5 ----- models/perm/access/main_test.go | 7 ------- models/project/main_test.go | 2 -- models/quota/main_test.go | 5 ----- models/repo/main_test.go | 8 +------- models/secret/main_test.go | 3 --- models/system/main_test.go | 6 ------ models/user/main_test.go | 6 +----- modules/activitypub/main_test.go | 5 ----- modules/activitypub/user_settings_test.go | 2 -- modules/indexer/code/indexer_test.go | 5 ----- modules/indexer/issues/indexer_test.go | 5 ----- modules/indexer/stats/indexer_test.go | 5 ----- modules/repository/main_test.go | 3 --- modules/templates/main_test.go | 4 ---- modules/testimport/import.go | 17 +++++++++++++++++ routers/api/actions/runner/main_test.go | 2 -- services/actions/main_test.go | 4 ---- services/attachment/attachment_test.go | 3 --- services/convert/main_test.go | 3 --- services/feed/action_test.go | 3 --- services/forgejo/main_test.go | 5 ----- services/gitdiff/main_test.go | 5 ----- services/issue/comments_test.go | 2 -- services/issue/main_test.go | 2 -- services/mailer/main_test.go | 2 +- services/moderation/main_test.go | 3 --- services/pull/main_test.go | 3 --- services/redirect/main_test.go | 5 ----- services/release/release_test.go | 3 --- services/repository/archiver/archiver_test.go | 3 --- services/repository/files/content_test.go | 3 --- services/webhook/main_test.go | 4 ---- services/wiki/wiki_test.go | 2 +- 44 files changed, 23 insertions(+), 173 deletions(-) create mode 100644 modules/testimport/import.go diff --git a/models/activities/main_test.go b/models/activities/main_test.go index a5245ab1d3..403cf10c0f 100644 --- a/models/activities/main_test.go +++ b/models/activities/main_test.go @@ -7,10 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/auth/main_test.go b/models/auth/main_test.go index b30db24483..5b8ca00831 100644 --- a/models/auth/main_test.go +++ b/models/auth/main_test.go @@ -8,12 +8,7 @@ import ( "forgejo.org/models/unittest" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/auth" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/perm/access" + _ "forgejo.org/modules/testimport" ) func TestMain(m *testing.M) { diff --git a/models/avatars/main_test.go b/models/avatars/main_test.go index bdc66954b1..f8c90a09e6 100644 --- a/models/avatars/main_test.go +++ b/models/avatars/main_test.go @@ -7,10 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/perm/access" ) func TestMain(m *testing.M) { diff --git a/models/db/main_test.go b/models/db/main_test.go index 4b06923950..77773b5d34 100644 --- a/models/db/main_test.go +++ b/models/db/main_test.go @@ -7,9 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/forgejo/semver/main_test.go b/models/forgejo/semver/main_test.go index dcc9d588cd..d4c75675ea 100644 --- a/models/forgejo/semver/main_test.go +++ b/models/forgejo/semver/main_test.go @@ -6,11 +6,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/git/main_test.go b/models/git/main_test.go index 63a3c363ab..c0b444db8f 100644 --- a/models/git/main_test.go +++ b/models/git/main_test.go @@ -7,11 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/issues/main_test.go b/models/issues/main_test.go index 05d854c964..c4057df9cc 100644 --- a/models/issues/main_test.go +++ b/models/issues/main_test.go @@ -9,12 +9,6 @@ import ( issues_model "forgejo.org/models/issues" "forgejo.org/models/unittest" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/repo" - _ "forgejo.org/models/user" - "github.com/stretchr/testify/require" ) diff --git a/models/main_test.go b/models/main_test.go index 0edcf8f49d..1e4efb46e4 100644 --- a/models/main_test.go +++ b/models/main_test.go @@ -12,10 +12,6 @@ import ( "forgejo.org/models/unittest" user_model "forgejo.org/models/user" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/system" - "github.com/stretchr/testify/require" ) diff --git a/models/organization/main_test.go b/models/organization/main_test.go index dd10b60d30..5951e06299 100644 --- a/models/organization/main_test.go +++ b/models/organization/main_test.go @@ -8,13 +8,7 @@ import ( "forgejo.org/models/unittest" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/organization" - _ "forgejo.org/models/repo" - _ "forgejo.org/models/user" + _ "forgejo.org/modules/testimport" ) func TestMain(m *testing.M) { diff --git a/models/packages/debian/search_test.go b/models/packages/debian/search_test.go index 43cca6c4bd..15e454afc0 100644 --- a/models/packages/debian/search_test.go +++ b/models/packages/debian/search_test.go @@ -14,11 +14,6 @@ import ( "forgejo.org/modules/packages" packages_service "forgejo.org/services/packages" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/models/packages/main_test.go b/models/packages/main_test.go index f9083d705d..35c37d4072 100644 --- a/models/packages/main_test.go +++ b/models/packages/main_test.go @@ -7,11 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/perm/access/main_test.go b/models/perm/access/main_test.go index 0c27d022e0..6ae18dbf5e 100644 --- a/models/perm/access/main_test.go +++ b/models/perm/access/main_test.go @@ -7,13 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/repo" - _ "forgejo.org/models/user" ) func TestMain(m *testing.M) { diff --git a/models/project/main_test.go b/models/project/main_test.go index eaa13bf309..55073c628d 100644 --- a/models/project/main_test.go +++ b/models/project/main_test.go @@ -7,8 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/repo" ) func TestMain(m *testing.M) { diff --git a/models/quota/main_test.go b/models/quota/main_test.go index ec0a0e0013..e752ecb690 100644 --- a/models/quota/main_test.go +++ b/models/quota/main_test.go @@ -7,11 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/models/repo/main_test.go b/models/repo/main_test.go index 9fd1cacc97..3f7ab214fa 100644 --- a/models/repo/main_test.go +++ b/models/repo/main_test.go @@ -8,13 +8,7 @@ import ( "forgejo.org/models/unittest" - _ "forgejo.org/models" // register table model - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/perm/access" // register table model - _ "forgejo.org/models/repo" // register table model - _ "forgejo.org/models/user" // register table model + _ "forgejo.org/modules/testimport" ) func TestMain(m *testing.M) { diff --git a/models/secret/main_test.go b/models/secret/main_test.go index 85bfec0c4f..ccf8b3ba41 100644 --- a/models/secret/main_test.go +++ b/models/secret/main_test.go @@ -7,9 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/activities" ) func TestMain(m *testing.M) { diff --git a/models/system/main_test.go b/models/system/main_test.go index ca2846527a..bd3406b986 100644 --- a/models/system/main_test.go +++ b/models/system/main_test.go @@ -7,12 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" // register models - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/system" // register models of system ) func TestMain(m *testing.M) { diff --git a/models/user/main_test.go b/models/user/main_test.go index f0dae086e0..902389fe06 100644 --- a/models/user/main_test.go +++ b/models/user/main_test.go @@ -8,11 +8,7 @@ import ( "forgejo.org/models/unittest" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/user" + _ "forgejo.org/modules/testimport" ) func TestMain(m *testing.M) { diff --git a/modules/activitypub/main_test.go b/modules/activitypub/main_test.go index c46c1759c1..a3f173f408 100644 --- a/modules/activitypub/main_test.go +++ b/modules/activitypub/main_test.go @@ -7,11 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/modules/activitypub/user_settings_test.go b/modules/activitypub/user_settings_test.go index 475e761e69..f70b39d5ce 100644 --- a/modules/activitypub/user_settings_test.go +++ b/modules/activitypub/user_settings_test.go @@ -11,8 +11,6 @@ import ( user_model "forgejo.org/models/user" "forgejo.org/modules/activitypub" - _ "forgejo.org/models" // https://forum.gitea.com/t/testfixtures-could-not-clean-table-access-no-such-table-access/4137/4 - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/code/indexer_test.go b/modules/indexer/code/indexer_test.go index 97f17b083f..87deaf928b 100644 --- a/modules/indexer/code/indexer_test.go +++ b/modules/indexer/code/indexer_test.go @@ -14,11 +14,6 @@ import ( "forgejo.org/modules/indexer/code/elasticsearch" "forgejo.org/modules/indexer/code/internal" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index 527627e0fc..99a09380e7 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -13,11 +13,6 @@ import ( "forgejo.org/modules/optional" "forgejo.org/modules/setting" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index a5899d2506..7d51d3f522 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -13,11 +13,6 @@ import ( "forgejo.org/modules/queue" "forgejo.org/modules/setting" - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/modules/repository/main_test.go b/modules/repository/main_test.go index 5906b10865..942a805638 100644 --- a/modules/repository/main_test.go +++ b/modules/repository/main_test.go @@ -7,9 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/modules/templates/main_test.go b/modules/templates/main_test.go index 946bc603f6..422bc497d8 100644 --- a/modules/templates/main_test.go +++ b/modules/templates/main_test.go @@ -9,10 +9,6 @@ import ( "forgejo.org/models/unittest" "forgejo.org/modules/markup" - - _ "forgejo.org/models" - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/issues" ) func TestMain(m *testing.M) { diff --git a/modules/testimport/import.go b/modules/testimport/import.go new file mode 100644 index 0000000000..cefa5b32a2 --- /dev/null +++ b/modules/testimport/import.go @@ -0,0 +1,17 @@ +// Copyright 2026 The Forgejo Authors +// SPDX-License-Identifier: MIT + +package testimport + +// ensure the init() function of those modules are called in a test +// environment that may not include them. It matters when the engine +// is trying to figure out the ordering of foreign keys, for instance + +import ( //revive:disable:blank-imports + _ "forgejo.org/models/actions" + _ "forgejo.org/models/activities" + _ "forgejo.org/models/auth" + _ "forgejo.org/models/forgefed" + _ "forgejo.org/models/perm/access" + _ "forgejo.org/models/repo" +) diff --git a/routers/api/actions/runner/main_test.go b/routers/api/actions/runner/main_test.go index 112ebe3cb6..e061521e92 100644 --- a/routers/api/actions/runner/main_test.go +++ b/routers/api/actions/runner/main_test.go @@ -7,8 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/actions/main_test.go b/services/actions/main_test.go index 71ec1d3426..1151ab8f20 100644 --- a/services/actions/main_test.go +++ b/services/actions/main_test.go @@ -7,10 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go index ef002bf16c..a6662b2837 100644 --- a/services/attachment/attachment_test.go +++ b/services/attachment/attachment_test.go @@ -13,9 +13,6 @@ import ( "forgejo.org/models/unittest" user_model "forgejo.org/models/user" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/convert/main_test.go b/services/convert/main_test.go index 5915d16be4..e6d7a4a323 100644 --- a/services/convert/main_test.go +++ b/services/convert/main_test.go @@ -7,9 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/feed/action_test.go b/services/feed/action_test.go index fd27bf32a9..51df063c52 100644 --- a/services/feed/action_test.go +++ b/services/feed/action_test.go @@ -18,9 +18,6 @@ import ( "forgejo.org/modules/setting" "forgejo.org/modules/test" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/forgejo/main_test.go b/services/forgejo/main_test.go index 5523ed1aab..12d768cbcb 100644 --- a/services/forgejo/main_test.go +++ b/services/forgejo/main_test.go @@ -6,11 +6,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/gitdiff/main_test.go b/services/gitdiff/main_test.go index cd7a6a4a6b..7deeef34c0 100644 --- a/services/gitdiff/main_test.go +++ b/services/gitdiff/main_test.go @@ -7,11 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/issue/comments_test.go b/services/issue/comments_test.go index 0bf6d6db3e..1b307c2b45 100644 --- a/services/issue/comments_test.go +++ b/services/issue/comments_test.go @@ -18,8 +18,6 @@ import ( issue_service "forgejo.org/services/issue" "forgejo.org/tests" - _ "forgejo.org/services/webhook" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/issue/main_test.go b/services/issue/main_test.go index 673ec5e4cc..b54ff9ca02 100644 --- a/services/issue/main_test.go +++ b/services/issue/main_test.go @@ -9,8 +9,6 @@ import ( "forgejo.org/models/unittest" "forgejo.org/modules/setting" "forgejo.org/services/webhook" - - _ "forgejo.org/models/actions" ) func TestMain(m *testing.M) { diff --git a/services/mailer/main_test.go b/services/mailer/main_test.go index a42f487c32..eb998aa7ec 100644 --- a/services/mailer/main_test.go +++ b/services/mailer/main_test.go @@ -16,7 +16,7 @@ import ( "forgejo.org/modules/test" "forgejo.org/modules/translation" - _ "forgejo.org/models/actions" + _ "forgejo.org/modules/testimport" "github.com/stretchr/testify/assert" ) diff --git a/services/moderation/main_test.go b/services/moderation/main_test.go index 3a268260d2..45de4cd7ab 100644 --- a/services/moderation/main_test.go +++ b/services/moderation/main_test.go @@ -7,9 +7,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/forgefed" - _ "forgejo.org/models/moderation" ) func TestMain(m *testing.M) { diff --git a/services/pull/main_test.go b/services/pull/main_test.go index 5262b5be50..ccbcd4b798 100644 --- a/services/pull/main_test.go +++ b/services/pull/main_test.go @@ -8,9 +8,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/redirect/main_test.go b/services/redirect/main_test.go index 7363791caa..3b3992acfa 100644 --- a/services/redirect/main_test.go +++ b/services/redirect/main_test.go @@ -6,11 +6,6 @@ import ( "testing" "forgejo.org/models/unittest" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/activities" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/release/release_test.go b/services/release/release_test.go index f03b4d42b8..2a593862ce 100644 --- a/services/release/release_test.go +++ b/services/release/release_test.go @@ -16,9 +16,6 @@ import ( "forgejo.org/modules/test" "forgejo.org/services/attachment" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/repository/archiver/archiver_test.go b/services/repository/archiver/archiver_test.go index 00d82267c9..1b9d062f1f 100644 --- a/services/repository/archiver/archiver_test.go +++ b/services/repository/archiver/archiver_test.go @@ -12,9 +12,6 @@ import ( "forgejo.org/modules/git" "forgejo.org/services/contexttest" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/repository/files/content_test.go b/services/repository/files/content_test.go index 8fc8f56b4f..da6c5552ef 100644 --- a/services/repository/files/content_test.go +++ b/services/repository/files/content_test.go @@ -13,9 +13,6 @@ import ( "forgejo.org/modules/gitrepo" api "forgejo.org/modules/structs" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/services/webhook/main_test.go b/services/webhook/main_test.go index 97957291ca..6b781633bd 100644 --- a/services/webhook/main_test.go +++ b/services/webhook/main_test.go @@ -9,10 +9,6 @@ import ( "forgejo.org/models/unittest" "forgejo.org/modules/hostmatcher" "forgejo.org/modules/setting" - - _ "forgejo.org/models" - _ "forgejo.org/models/actions" - _ "forgejo.org/models/forgefed" ) func TestMain(m *testing.M) { diff --git a/services/wiki/wiki_test.go b/services/wiki/wiki_test.go index cb984425af..9471904e38 100644 --- a/services/wiki/wiki_test.go +++ b/services/wiki/wiki_test.go @@ -14,7 +14,7 @@ import ( "forgejo.org/modules/git" "forgejo.org/modules/gitrepo" - _ "forgejo.org/models/actions" + _ "forgejo.org/modules/testimport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"