-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve LoadUnitConfig to handle invalid or duplicate units (#23736)
The old code just parses an invalid key to `TypeInvalid` and uses it as normal, and duplicate keys will be kept. So this PR will ignore invalid key and log warning and also deduplicate valid units.
- Loading branch information
Showing
3 changed files
with
77 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
// Copyright 2023 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package unit | ||
|
||
import ( | ||
"testing" | ||
|
||
"code.gitea.io/gitea/modules/setting" | ||
|
||
"github.com/stretchr/testify/assert" | ||
) | ||
|
||
func TestLoadUnitConfig(t *testing.T) { | ||
defer func(disabledRepoUnits, defaultRepoUnits, defaultForkRepoUnits []Type) { | ||
DisabledRepoUnits = disabledRepoUnits | ||
DefaultRepoUnits = defaultRepoUnits | ||
DefaultForkRepoUnits = defaultForkRepoUnits | ||
}(DisabledRepoUnits, DefaultRepoUnits, DefaultForkRepoUnits) | ||
defer func(disabledRepoUnits, defaultRepoUnits, defaultForkRepoUnits []string) { | ||
setting.Repository.DisabledRepoUnits = disabledRepoUnits | ||
setting.Repository.DefaultRepoUnits = defaultRepoUnits | ||
setting.Repository.DefaultForkRepoUnits = defaultForkRepoUnits | ||
}(setting.Repository.DisabledRepoUnits, setting.Repository.DefaultRepoUnits, setting.Repository.DefaultForkRepoUnits) | ||
|
||
t.Run("regular", func(t *testing.T) { | ||
setting.Repository.DisabledRepoUnits = []string{"repo.issues"} | ||
setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls"} | ||
setting.Repository.DefaultForkRepoUnits = []string{"repo.releases"} | ||
LoadUnitConfig() | ||
assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) | ||
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) | ||
assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) | ||
}) | ||
t.Run("invalid", func(t *testing.T) { | ||
setting.Repository.DisabledRepoUnits = []string{"repo.issues", "invalid.1"} | ||
setting.Repository.DefaultRepoUnits = []string{"repo.code", "invalid.2", "repo.releases", "repo.issues", "repo.pulls"} | ||
setting.Repository.DefaultForkRepoUnits = []string{"invalid.3", "repo.releases"} | ||
LoadUnitConfig() | ||
assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) | ||
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) | ||
assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) | ||
}) | ||
t.Run("duplicate", func(t *testing.T) { | ||
setting.Repository.DisabledRepoUnits = []string{"repo.issues", "repo.issues"} | ||
setting.Repository.DefaultRepoUnits = []string{"repo.code", "repo.releases", "repo.issues", "repo.pulls", "repo.code"} | ||
setting.Repository.DefaultForkRepoUnits = []string{"repo.releases", "repo.releases"} | ||
LoadUnitConfig() | ||
assert.Equal(t, []Type{TypeIssues}, DisabledRepoUnits) | ||
assert.Equal(t, []Type{TypeCode, TypeReleases, TypePullRequests}, DefaultRepoUnits) | ||
assert.Equal(t, []Type{TypeCode, TypeReleases}, DefaultForkRepoUnits) | ||
}) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters