diff options
Diffstat (limited to 'modules')
23 files changed, 21 insertions, 10 deletions
diff --git a/modules/convert/utils_test.go b/modules/convert/utils_test.go index bd59299c01..e0ab15dfd8 100644 --- a/modules/convert/utils_test.go +++ b/modules/convert/utils_test.go @@ -7,8 +7,9 @@ package convert import ( "testing" - _ "github.com/mattn/go-sqlite3" "github.com/stretchr/testify/assert" + + _ "github.com/mattn/go-sqlite3" ) func TestToCorrectPageSize(t *testing.T) { diff --git a/modules/doctor/fix16961.go b/modules/doctor/fix16961.go index e0e44b414b..2e1db834cd 100644 --- a/modules/doctor/fix16961.go +++ b/modules/doctor/fix16961.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" + "xorm.io/builder" ) diff --git a/modules/doctor/fix16961_test.go b/modules/doctor/fix16961_test.go index 017f585335..986425b4d8 100644 --- a/modules/doctor/fix16961_test.go +++ b/modules/doctor/fix16961_test.go @@ -8,6 +8,7 @@ import ( "testing" "code.gitea.io/gitea/models" + "github.com/stretchr/testify/assert" ) diff --git a/modules/git/commit_info_test.go b/modules/git/commit_info_test.go index 0608801f9d..8467bdaa90 100644 --- a/modules/git/commit_info_test.go +++ b/modules/git/commit_info_test.go @@ -12,6 +12,7 @@ import ( "time" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/git/pipeline/lfs.go b/modules/git/pipeline/lfs.go index 46a48b710c..4551ccd3f4 100644 --- a/modules/git/pipeline/lfs.go +++ b/modules/git/pipeline/lfs.go @@ -17,6 +17,7 @@ import ( "time" "code.gitea.io/gitea/modules/git" + gogit "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing/object" ) diff --git a/modules/git/repo_compare_test.go b/modules/git/repo_compare_test.go index 3a6cda955c..ecd1aa4e6d 100644 --- a/modules/git/repo_compare_test.go +++ b/modules/git/repo_compare_test.go @@ -11,6 +11,7 @@ import ( "testing" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/git/repo_tag_test.go b/modules/git/repo_tag_test.go index cfab9edd8f..136287e1a9 100644 --- a/modules/git/repo_tag_test.go +++ b/modules/git/repo_tag_test.go @@ -9,6 +9,7 @@ import ( "testing" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index 6684fbe842..9a876d2a6b 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -17,6 +17,7 @@ import ( "code.gitea.io/gitea/modules/analyze" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "github.com/alecthomas/chroma" "github.com/alecthomas/chroma/formatters/html" "github.com/alecthomas/chroma/lexers" diff --git a/modules/highlight/highlight_test.go b/modules/highlight/highlight_test.go index 0a67e4c602..29a15c0b53 100644 --- a/modules/highlight/highlight_test.go +++ b/modules/highlight/highlight_test.go @@ -9,6 +9,7 @@ import ( "testing" "code.gitea.io/gitea/modules/setting" + "gopkg.in/ini.v1" ) diff --git a/modules/indexer/issues/bleve_test.go b/modules/indexer/issues/bleve_test.go index 70a9582e1d..036b318d85 100644 --- a/modules/indexer/issues/bleve_test.go +++ b/modules/indexer/issues/bleve_test.go @@ -9,6 +9,7 @@ import ( "testing" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go index edfaddb648..8353891c7c 100644 --- a/modules/indexer/issues/indexer_test.go +++ b/modules/indexer/issues/indexer_test.go @@ -15,9 +15,8 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "gopkg.in/ini.v1" - "github.com/stretchr/testify/assert" + "gopkg.in/ini.v1" ) func TestMain(m *testing.M) { diff --git a/modules/indexer/stats/indexer_test.go b/modules/indexer/stats/indexer_test.go index c451e80238..f52d73a32e 100644 --- a/modules/indexer/stats/indexer_test.go +++ b/modules/indexer/stats/indexer_test.go @@ -13,9 +13,8 @@ import ( "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/setting" - "gopkg.in/ini.v1" - "github.com/stretchr/testify/assert" + "gopkg.in/ini.v1" ) func TestMain(m *testing.M) { diff --git a/modules/log/file_test.go b/modules/log/file_test.go index 39d2467a1f..09a07b1e27 100644 --- a/modules/log/file_test.go +++ b/modules/log/file_test.go @@ -15,6 +15,7 @@ import ( "time" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/markup/mdstripper/mdstripper.go b/modules/markup/mdstripper/mdstripper.go index 52464f3e1b..2977c81977 100644 --- a/modules/markup/mdstripper/mdstripper.go +++ b/modules/markup/mdstripper/mdstripper.go @@ -6,12 +6,11 @@ package mdstripper import ( "bytes" + "io" "net/url" "strings" "sync" - "io" - "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/markup/common" "code.gitea.io/gitea/modules/setting" diff --git a/modules/markup/renderer_test.go b/modules/markup/renderer_test.go index 118fa2632b..4cfa022463 100644 --- a/modules/markup/renderer_test.go +++ b/modules/markup/renderer_test.go @@ -8,6 +8,7 @@ import ( "testing" . "code.gitea.io/gitea/modules/markup" + _ "code.gitea.io/gitea/modules/markup/markdown" "github.com/stretchr/testify/assert" diff --git a/modules/notification/action/action_test.go b/modules/notification/action/action_test.go index 3adcae83fd..448242bcdf 100644 --- a/modules/notification/action/action_test.go +++ b/modules/notification/action/action_test.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/unittest" + "github.com/stretchr/testify/assert" ) diff --git a/modules/queue/queue_disk_channel_test.go b/modules/queue/queue_disk_channel_test.go index 99fb65934e..d464a183a0 100644 --- a/modules/queue/queue_disk_channel_test.go +++ b/modules/queue/queue_disk_channel_test.go @@ -10,6 +10,7 @@ import ( "testing" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/queue/queue_disk_test.go b/modules/queue/queue_disk_test.go index 549a04104e..a2c21fec08 100644 --- a/modules/queue/queue_disk_test.go +++ b/modules/queue/queue_disk_test.go @@ -11,6 +11,7 @@ import ( "time" "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" ) diff --git a/modules/repofiles/blob_test.go b/modules/repofiles/blob_test.go index c219892aec..8950c349e6 100644 --- a/modules/repofiles/blob_test.go +++ b/modules/repofiles/blob_test.go @@ -8,7 +8,6 @@ import ( "testing" "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" diff --git a/modules/repofiles/content_test.go b/modules/repofiles/content_test.go index e3230698bc..f6a953fab9 100644 --- a/modules/repofiles/content_test.go +++ b/modules/repofiles/content_test.go @@ -9,7 +9,6 @@ import ( "testing" "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" diff --git a/modules/repofiles/tree_test.go b/modules/repofiles/tree_test.go index 512313c43b..6917b8915b 100644 --- a/modules/repofiles/tree_test.go +++ b/modules/repofiles/tree_test.go @@ -8,7 +8,6 @@ import ( "testing" "code.gitea.io/gitea/models/unittest" - api "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/test" diff --git a/modules/repository/commits_test.go b/modules/repository/commits_test.go index 0d6c2e4c5c..b6a63dc127 100644 --- a/modules/repository/commits_test.go +++ b/modules/repository/commits_test.go @@ -13,6 +13,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/git" + "github.com/stretchr/testify/assert" ) diff --git a/modules/setting/queue.go b/modules/setting/queue.go index 1668cc63a3..56a036aeef 100644 --- a/modules/setting/queue.go +++ b/modules/setting/queue.go @@ -10,6 +10,7 @@ import ( "time" "code.gitea.io/gitea/modules/log" + ini "gopkg.in/ini.v1" ) |