Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 解决单元测试不通过的问题 #124

Merged
merged 1 commit into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions adjust-grub-theme/adjust_grub_theme_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ func (s *su) TestAdjustThemeNormal() {
}

func (s *su) TestAdjustThemeFallback() {
osVersionFile = "testdata/os-version"
optThemeOutputDir = "testdata/tmp"
err := adjustThemeFallback()
assert.Equal(s.T(), nil, err)
Expand Down
4 changes: 3 additions & 1 deletion adjust-grub-theme/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ var optTerminalFontName string
var optFallbackOnly bool
var logger *log.Logger

var osVersionFile = "/etc/os-version"

func init() {
logger = log.NewLogger("adjust-grub-theme")

Expand Down Expand Up @@ -525,7 +527,7 @@ func loadV25BackgroundImage() (image.Image, image.Image, error) {
}
logger.Warning("failed to load image background_source:", err)

systemName, err := getSystemNameFromOSVersionFile("/etc/os-version")
systemName, err := getSystemNameFromOSVersionFile(osVersionFile)
if err != nil || systemName == "" {
logger.Warningf("error get systemName %s: %v\n", systemName, err)
return nil, nil, err
Expand Down
10 changes: 10 additions & 0 deletions adjust-grub-theme/testdata/os-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Version]
SystemName=Deepin
SystemName[zh_CN]=深度操作系统
ProductType=Desktop
ProductType[zh_CN]=桌面
EditionName=Community
EditionName[en_US]=Community
EditionName[zh_CN]=社区版
MajorVersion=23
MinorVersion=23
Loading