From be24a656db608e8ac34dcf98ded185b918430c72 Mon Sep 17 00:00:00 2001 From: dengbo Date: Fri, 14 Jul 2023 16:31:30 +0800 Subject: [PATCH] fix: fix daemon packaging error use test path to test interface Log: --- langselector1/locale.go | 6 +++--- langselector1/locale_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/langselector1/locale.go b/langselector1/locale.go index 9eb3564c1..8a4cccbd7 100644 --- a/langselector1/locale.go +++ b/langselector1/locale.go @@ -672,10 +672,10 @@ func (lang *LangSelector) deleteLocale(locale string) error { return nil } -func getCurrentLocaleRegion() (string, error) { +func getCurrentLocaleRegion(path string) (string, error) { var currentLocaleRegion string - infos, err := readEnvFile(localeConfigFile) + infos, err := readEnvFile(path) if err != nil { return currentLocaleRegion, err } @@ -692,7 +692,7 @@ func getCurrentLocaleRegion() (string, error) { // 获取当前用户的locale region, 如果没有设置过,使用系统的locale region func (lang *LangSelector) getLocaleRegion() (string, error) { - l, err := getCurrentLocaleRegion() + l, err := getCurrentLocaleRegion(localeConfigFile) if err != nil { logger.Warning("failed to get current locale region", err) return lang.CurrentLocale, nil diff --git a/langselector1/locale_test.go b/langselector1/locale_test.go index 271860bb7..ad602f68d 100644 --- a/langselector1/locale_test.go +++ b/langselector1/locale_test.go @@ -48,6 +48,6 @@ func Test_WriteLocaleRegionsEnvFile(t *testing.T) { } func Test_getCurrentLocaleRegione(t *testing.T) { - _, err := getCurrentLocaleRegion() + _, err := getCurrentLocaleRegion("testdata/pam_environment") assert.NoError(t, err) }