Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitab4d1bd

Browse files
committed
Filter out gitea-specific variables in tests
There is no particular reason to set gitea variables globally.Nonetheless, some misguided packagers set GITEA_CUSTOM in /etc/profilebreaking tests.Fixes:#36042
1 parentebf9b4d commitab4d1bd

File tree

16 files changed

+104
-0
lines changed

16 files changed

+104
-0
lines changed

‎.github/workflows/pull-db-tests.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,9 @@ jobs:
146146
-name:unit-tests
147147
run:make unit-test-coverage test-check
148148
env:
149+
GITEA_ROOT:foo
150+
GITEA_CONF:bar
151+
GITEA_CUSTOM:baz
149152
TAGS:bindata
150153
RACE_ENABLED:true
151154
GITHUB_READ_TOKEN:${{ secrets.GITHUB_READ_TOKEN }}

‎models/unittest/fixtures_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"code.gitea.io/gitea/models/unittest"
1111
user_model"code.gitea.io/gitea/models/user"
1212
"code.gitea.io/gitea/modules/test"
13+
"code.gitea.io/gitea/tests/env"
1314

1415
"github.com/stretchr/testify/require"
1516
"xorm.io/xorm"
@@ -112,3 +113,8 @@ func BenchmarkFixturesLoader(b *testing.B) {
112113
}
113114
})
114115
}
116+
117+
funcTestMain(m*testing.M) {
118+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
119+
m.Run()
120+
}

‎models/unittest/testdb.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"code.gitea.io/gitea/modules/tempdir"
2424
"code.gitea.io/gitea/modules/test"
2525
"code.gitea.io/gitea/modules/util"
26+
"code.gitea.io/gitea/tests/env"
2627

2728
"github.com/stretchr/testify/assert"
2829
"xorm.io/xorm"
@@ -73,6 +74,7 @@ type TestOptions struct {
7374
// MainTest a reusable TestMain(..) function for unit tests that need to use a
7475
// test database. Creates the test database, and sets necessary settings.
7576
funcMainTest(m*testing.M,testOptsArg...*TestOptions) {
77+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
7678
testOpts:=util.OptionalArg(testOptsArg,&TestOptions{})
7779
giteaRoot=test.SetupGiteaRoot()
7880
setting.CustomPath=filepath.Join(giteaRoot,"custom")

‎modules/git/attribute/main_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"code.gitea.io/gitea/modules/git"
1212
"code.gitea.io/gitea/modules/setting"
1313
"code.gitea.io/gitea/modules/util"
14+
"code.gitea.io/gitea/tests/env"
1415
)
1516

1617
functestRun(m*testing.M)error {
@@ -33,6 +34,7 @@ func testRun(m *testing.M) error {
3334
}
3435

3536
funcTestMain(m*testing.M) {
37+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
3638
iferr:=testRun(m);err!=nil {
3739
_,_=fmt.Fprintf(os.Stderr,"Test failed: %v",err)
3840
os.Exit(1)

‎modules/git/git_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010

1111
"code.gitea.io/gitea/modules/setting"
1212
"code.gitea.io/gitea/modules/tempdir"
13+
"code.gitea.io/gitea/tests/env"
1314

1415
"github.com/hashicorp/go-version"
1516
"github.com/stretchr/testify/assert"
@@ -36,6 +37,7 @@ func testRun(m *testing.M) error {
3637
}
3738

3839
funcTestMain(m*testing.M) {
40+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
3941
iferr:=testRun(m);err!=nil {
4042
_,_=fmt.Fprintf(os.Stderr,"Test failed: %v",err)
4143
os.Exit(1)

‎modules/git/gitcmd/command_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ import (
1010

1111
"code.gitea.io/gitea/modules/setting"
1212
"code.gitea.io/gitea/modules/tempdir"
13+
"code.gitea.io/gitea/tests/env"
1314

1415
"github.com/stretchr/testify/assert"
1516
)
1617

1718
funcTestMain(m*testing.M) {
19+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
1820
gitHomePath,cleanup,err:=tempdir.OsTempDir("gitea-test").MkdirTempRandom("git-home")
1921
iferr!=nil {
2022
_,_=fmt.Fprintf(os.Stderr,"unable to create temp dir: %v",err)

‎modules/git/languagestats/main_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
"code.gitea.io/gitea/modules/git"
1212
"code.gitea.io/gitea/modules/setting"
1313
"code.gitea.io/gitea/modules/util"
14+
"code.gitea.io/gitea/tests/env"
1415
)
1516

1617
functestRun(m*testing.M)error {
@@ -33,6 +34,7 @@ func testRun(m *testing.M) error {
3334
}
3435

3536
funcTestMain(m*testing.M) {
37+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
3638
iferr:=testRun(m);err!=nil {
3739
_,_=fmt.Fprintf(os.Stderr,"Test failed: %v",err)
3840
os.Exit(1)

‎modules/gitrepo/main_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@ import (
1212
"code.gitea.io/gitea/modules/setting"
1313
"code.gitea.io/gitea/modules/tempdir"
1414
"code.gitea.io/gitea/modules/test"
15+
"code.gitea.io/gitea/tests/env"
1516
)
1617

1718
funcTestMain(m*testing.M) {
19+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
1820
gitHomePath,cleanup,err:=tempdir.OsTempDir("gitea-test").MkdirTempRandom("git-home")
1921
iferr!=nil {
2022
log.Fatal("Unable to create temp dir: %v",err)

‎modules/markup/main_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import (
99

1010
"code.gitea.io/gitea/modules/markup"
1111
"code.gitea.io/gitea/modules/setting"
12+
"code.gitea.io/gitea/tests/env"
1213
)
1314

1415
funcTestMain(m*testing.M) {
16+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
1517
setting.IsInTesting=true
1618
markup.RenderBehaviorForTesting.DisableAdditionalAttributes=true
1719
os.Exit(m.Run())

‎modules/markup/markdown/main_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import (
99

1010
"code.gitea.io/gitea/modules/markup"
1111
"code.gitea.io/gitea/modules/setting"
12+
"code.gitea.io/gitea/tests/env"
1213
)
1314

1415
funcTestMain(m*testing.M) {
16+
env.Filter([]string{"GITEA_TEST_","GITEA_UNIT_TESTS_"}, []string{"GITEA_"})
1517
setting.IsInTesting=true
1618
markup.RenderBehaviorForTesting.DisableAdditionalAttributes=true
1719
os.Exit(m.Run())

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp