owen/gitocean
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: move all test blank imports in a single package (#10662)

Browse Source 
- 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 <michael.kriese@gmx.de>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: limiting-factor <limiting-factor@posteo.com>
Co-committed-by: limiting-factor <limiting-factor@posteo.com>
This commit is contained in:
limiting-factor
2026-01-02 05:32:32 +01:00
committed by Gusted
parent 84d2df5b08
commit 2faaa4c5b4
44 changed files with 23 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
models/activities/main_test.go
-4
View File
@@ -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) {
models/auth/main_test.go
+1 -6
View File
@@ -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) {
models/avatars/main_test.go
-4
View File
@@ -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) {
models/db/main_test.go
-3
View File
@@ -7,9 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models"
_ "forgejo.org/models/repo"
)
func TestMain(m *testing.M) {
models/forgejo/semver/main_test.go
-5
View File
@@ -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) {
models/git/main_test.go
-5
View File
@@ -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) {
models/issues/main_test.go
-6
View File
@@ -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"
)
models/main_test.go
-4
View File
@@ -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"
)
models/organization/main_test.go
+1 -7
View File
@@ -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) {
models/packages/debian/search_test.go
-5
View File
@@ -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"
)
models/packages/main_test.go
-5
View File
@@ -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) {
models/perm/access/main_test.go
-7
View File
@@ -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) {
models/project/main_test.go
-2
View File
@@ -7,8 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models/repo"
)
func TestMain(m *testing.M) {
models/quota/main_test.go
-5
View File
@@ -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) {
models/repo/main_test.go
+1 -7
View File
@@ -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) {
models/secret/main_test.go
-3
View File
@@ -7,9 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models"
_ "forgejo.org/models/activities"
)
func TestMain(m *testing.M) {
models/system/main_test.go
-6
View File
@@ -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) {
models/user/main_test.go
+1 -5
View File
@@ -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) {
modules/activitypub/main_test.go
-5
View File
@@ -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) {
modules/activitypub/user_settings_test.go
-2
View File
@@ -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"
)
modules/indexer/code/indexer_test.go
-5
View File
@@ -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"
)
modules/indexer/issues/indexer_test.go
-5
View File
@@ -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"
)
modules/indexer/stats/indexer_test.go
-5
View File
@@ -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"
)
modules/repository/main_test.go
-3
View File
@@ -7,9 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models/actions"
_ "forgejo.org/models/forgefed"
)
func TestMain(m *testing.M) {
modules/templates/main_test.go
-4
View File
@@ -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) {
modules/testimport/import.go
+17
View File
@@ -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"
)
routers/api/actions/runner/main_test.go
-2
View File
@@ -7,8 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models/forgefed"
)
func TestMain(m *testing.M) {
services/actions/main_test.go
-4
View File
@@ -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) {
services/attachment/attachment_test.go
-3
View File
@@ -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"
)
services/convert/main_test.go
-3
View File
@@ -7,9 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models/actions"
_ "forgejo.org/models/forgefed"
)
func TestMain(m *testing.M) {
services/feed/action_test.go
-3
View File
@@ -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"
)
services/forgejo/main_test.go
-5
View File
@@ -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) {
services/gitdiff/main_test.go
-5
View File
@@ -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) {
services/issue/comments_test.go
-2
View File
@@ -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"
)
services/issue/main_test.go
-2
View File
@@ -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) {
services/mailer/main_test.go
+1 -1
View File
@@ -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"
)
services/moderation/main_test.go
-3
View File
@@ -7,9 +7,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models/forgefed"
_ "forgejo.org/models/moderation"
)
func TestMain(m *testing.M) {
services/pull/main_test.go
-3
View File
@@ -8,9 +8,6 @@ import (
"testing"
"forgejo.org/models/unittest"
_ "forgejo.org/models/actions"
_ "forgejo.org/models/forgefed"
)
func TestMain(m *testing.M) {
services/redirect/main_test.go
-5
View File
@@ -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) {
services/release/release_test.go
-3
View File
@@ -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"
)
services/repository/archiver/archiver_test.go
-3
View File
@@ -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"
)
services/repository/files/content_test.go
-3
View File
@@ -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"
)
services/webhook/main_test.go
-4
View File
@@ -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) {
services/wiki/wiki_test.go
+1 -1
View File
@@ -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"