Bugfix: i18n is initialized too late

See related issue: ubuntu/adsys#656
canonical · Mar 29, 2023 · e14ebef · e14ebef
1 parent 652e491
commit e14ebef
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/windows-agent/cmd/ubuntu-pro-agent/main.go b/windows-agent/cmd/ubuntu-pro-agent/main.go
@@ -19,6 +19,7 @@ import (
 //go:generate go run ../generate_completion_documentation.go update-doc-cli-ref
 
 func main() {
+	i18n.InitI18nDomain(common.TEXTDOMAIN)
 	a := agent.New()
 	os.Exit(run(a))
 }
@@ -30,7 +31,6 @@ type app interface {
 }
 
 func run(a app) int {
-	i18n.InitI18nDomain(common.TEXTDOMAIN)
 	defer installSignalHandler(a)()
 
 	log.SetFormatter(&log.TextFormatter{

diff --git a/windows-agent/cmd/ubuntu-pro-agent/main_test.go b/windows-agent/cmd/ubuntu-pro-agent/main_test.go
@@ -32,6 +32,8 @@ func (a *myApp) Quit() {
 }
 
 func TestRun(t *testing.T) {
+	t.Parallel()
+
 	tests := map[string]struct {
 		runError         bool
 		usageErrorReturn bool
@@ -46,6 +48,8 @@ func TestRun(t *testing.T) {
 	for name, tc := range tests {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
 			a := myApp{
 				done:             make(chan struct{}),
 				runError:         tc.runError,

diff --git a/wsl-pro-service/cmd/wsl-pro-service/main.go b/wsl-pro-service/cmd/wsl-pro-service/main.go
@@ -19,6 +19,7 @@ import (
 //go:generate go run ../generate_completion_documentation.go update-doc-cli-ref
 
 func main() {
+	i18n.InitI18nDomain(common.TEXTDOMAIN)
 	a := service.New()
 	os.Exit(run(a))
 }
@@ -30,7 +31,6 @@ type app interface {
 }
 
 func run(a app) int {
-	i18n.InitI18nDomain(common.TEXTDOMAIN)
 	defer installSignalHandler(a)()
 
 	log.SetFormatter(&log.TextFormatter{

diff --git a/wsl-pro-service/cmd/wsl-pro-service/main_test.go b/wsl-pro-service/cmd/wsl-pro-service/main_test.go
@@ -64,6 +64,8 @@ func TestRunSignal(t *testing.T) {
 }
 
 func TestRun(t *testing.T) {
+	t.Parallel()
+
 	tests := map[string]struct {
 		runError         bool
 		usageErrorReturn bool
@@ -78,6 +80,8 @@ func TestRun(t *testing.T) {
 	for name, tc := range tests {
 		tc := tc
 		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
 			a := myApp{
 				done:             make(chan struct{}),
 				runError:         tc.runError,