From 1c5048546ada0eb34259e32e82ab5f940d47233a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Fri, 17 Nov 2023 20:38:08 +0100 Subject: [PATCH 1/4] Fix variable collision with imported package name --- src/go/lib/config/config_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/go/lib/config/config_test.go b/src/go/lib/config/config_test.go index a09c2db4..438ca5f7 100644 --- a/src/go/lib/config/config_test.go +++ b/src/go/lib/config/config_test.go @@ -129,14 +129,14 @@ func TestOverrideConfig(t *testing.T) { } func TestDefaultFiles(t *testing.T) { - user, _ := user.Current() + currentUser, _ := user.Current() toolname := "pt-testing" want := []string{ "/etc/percona-toolkit/percona-toolkit.conf", fmt.Sprintf("/etc/percona-toolkit/%s.conf", toolname), - fmt.Sprintf("%s/.percona-toolkit.conf", user.HomeDir), - fmt.Sprintf("%s/.%s.conf", user.HomeDir, toolname), + fmt.Sprintf("%s/.percona-toolkit.conf", currentUser.HomeDir), + fmt.Sprintf("%s/.%s.conf", currentUser.HomeDir, toolname), } got, err := DefaultConfigFiles(toolname) From 61021d9ce6c0e626501d6b5cd3a2f62ef68b10d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Sun, 19 Nov 2023 22:13:42 +0100 Subject: [PATCH 2/4] Update src/go/lib/config/config_test.go Co-authored-by: Sveta Smirnova --- src/go/lib/config/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/go/lib/config/config_test.go b/src/go/lib/config/config_test.go index 438ca5f7..6ab1170e 100644 --- a/src/go/lib/config/config_test.go +++ b/src/go/lib/config/config_test.go @@ -129,7 +129,7 @@ func TestOverrideConfig(t *testing.T) { } func TestDefaultFiles(t *testing.T) { - currentUser, _ := user.Current() + current, _ := user.Current() toolname := "pt-testing" want := []string{ From ed7f4b3e396635daa3a32c27c4d1d19cfa7054fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Sun, 19 Nov 2023 22:13:47 +0100 Subject: [PATCH 3/4] Update src/go/lib/config/config_test.go Co-authored-by: Sveta Smirnova --- src/go/lib/config/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/go/lib/config/config_test.go b/src/go/lib/config/config_test.go index 6ab1170e..67c947c5 100644 --- a/src/go/lib/config/config_test.go +++ b/src/go/lib/config/config_test.go @@ -135,7 +135,7 @@ func TestDefaultFiles(t *testing.T) { want := []string{ "/etc/percona-toolkit/percona-toolkit.conf", fmt.Sprintf("/etc/percona-toolkit/%s.conf", toolname), - fmt.Sprintf("%s/.percona-toolkit.conf", currentUser.HomeDir), + fmt.Sprintf("%s/.percona-toolkit.conf", current.HomeDir), fmt.Sprintf("%s/.%s.conf", currentUser.HomeDir, toolname), } From c6b6a4086d44c6808eda793347c0de28350e4c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Sun, 19 Nov 2023 22:13:53 +0100 Subject: [PATCH 4/4] Update src/go/lib/config/config_test.go Co-authored-by: Sveta Smirnova --- src/go/lib/config/config_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/go/lib/config/config_test.go b/src/go/lib/config/config_test.go index 67c947c5..1eb5fd05 100644 --- a/src/go/lib/config/config_test.go +++ b/src/go/lib/config/config_test.go @@ -136,7 +136,7 @@ func TestDefaultFiles(t *testing.T) { "/etc/percona-toolkit/percona-toolkit.conf", fmt.Sprintf("/etc/percona-toolkit/%s.conf", toolname), fmt.Sprintf("%s/.percona-toolkit.conf", current.HomeDir), - fmt.Sprintf("%s/.%s.conf", currentUser.HomeDir, toolname), + fmt.Sprintf("%s/.%s.conf", current.HomeDir, toolname), } got, err := DefaultConfigFiles(toolname)